From 3a7c826875065a425373c8779b99e38dadd29502 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 11 十月 2021 15:48:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html | 6 ++
WebTM/layuiadmin/Scripts/webConfig.js | 4 +-
WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html | 68 ++++++++++++++++++++++++++++++----
3 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8c20031..c0f42d2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,14 +5,14 @@
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
- //var WEBURL = "http://localhost/API/";
+ var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index f5bb2bc..ea90c1c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -51,14 +51,14 @@
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
- <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-form-item">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鍥哄畾椤圭洰</label>
<div class="layui-input-block">
- <input type="radio" name="HSelectCus" id="HSelectCus" value="true" title="宸ュ簭">
- <input type="radio" name="HSelectMater" id="HSelectMater" value="false" title="鐗╂枡">
- <input type="radio" name="HSelectCusNone" id="HSelectCusNone" value="false" title="鑷敱" checked>
+ <input type="radio" name="FixedItems" value="SProc" title="宸ュ簭">
+ <input type="radio" name="FixedItems" value="SMater" title="鐗╂枡">
+ <input type="radio" name="FixedItems" value="SFree" title="鑷敱" checked>
</div>
</div>
</div>
@@ -116,7 +116,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ュ簭宸ヤ环浠ｇ爜</label>
+ <label class="layui-form-label">宸ュ簭宸ヤ环<br/>璧勬枡浠ｇ爜</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="宸ュ簭宸ヤ环浠ｇ爜" id="宸ュ簭宸ヤ环浠ｇ爜" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
@@ -248,7 +248,8 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
//鍏敤鍙橀噺
var rowdata;
var option = [];
@@ -299,6 +300,23 @@
};
switch (obj.event) {
case 'btn-AddLine':
+ var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+ if (FixedItems == "SFree") {
+
+ }
+ else if (FixedItems == "SMater") {
+ NewRow.HMaterIDCol = $("#HMaterID").val();
+ NewRow.HMaterNumberCol = $("#HMaterNumber").val();
+ NewRow.HMaterNameCol = $("#HMaterName").val();
+ NewRow.HMaterModelCol = $("#HMaterModel").val();
+ }
+ else if (FixedItems == "SProc") {
+ NewRow.HProcIDCol = $("#HProcID").val();
+ NewRow.HProcNumberCol = $("#HProcNumber").val();
+ NewRow.HProcNameCol = $("#HProcName").val();
+ }
+ NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
+ NewRow.HEndDateCol = "2100-01-01";
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
@@ -404,6 +422,14 @@
, HMaterNameCol: checkStatus.data[0].HName
, HMaterModelCol: checkStatus.data[0].HModel
});
+ var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+ if (FixedItems == "SProc") {
+ obj.update({
+ HProcIDCol: $("#HProcID").val()
+ , HProcNumberCol: $("#HProcNumber").val()
+ , HProcNameCol: $("#HProcName").val()
+ });
+ }
layer.close(layer.index);
}
, btn2: function (index, layero) {
@@ -435,6 +461,15 @@
, HProcNumberCol: checkStatus.data[0].宸ュ簭浠ｇ爜
, HProcNameCol: checkStatus.data[0].宸ュ簭
});
+ var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+ if (FixedItems == "SMater") {
+ obj.update({
+ HMaterIDCol: $("#HMaterID").val()
+ , HMaterNumberCol: $("#HMaterNumber").val()
+ , HMaterNameCol: $("#HMaterName").val()
+ , HMaterModelCol: $("#HMaterModel").val()
+ });
+ }
layer.close(layer.index);
}
, btn2: function (index, layero) {
@@ -688,8 +723,23 @@
, { field: 'HSourceNumberCol', title: '璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
, { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
- , { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', edit: 'text' }
- , { field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', edit: 'text' }
+ , { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', edit: 'text', width: 110
+ , templet: function (d) {
+ if (d.HBeginDateCol == null) {
+ return "";
+ }
+ return util.toDateString(d.HBeginDateCol, "yyyy-MM-dd");
+ }
+ }
+ , {
+ field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', edit: 'text', width: 110
+ , templet: function (d) {
+ if (d.HEndDateCol == null) {
+ return "";
+ }
+ return util.toDateString(d.HEndDateCol, "yyyy-MM-dd");
+ }
+ }
, { field: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
, { field: 'HFlowFlagCol', title: '娴佽浆榛樿', templet: '#HFlowFlagCol' }
, { field: 'HPayFlagCol', title: '宸ヨ祫榛樿', templet: '#HPayFlagCol' }
@@ -715,6 +765,8 @@
none: '鏃犳暟鎹紒'
}
};
+ rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
+ rowdata[0].HEndDateCol = "2100-01-01";
option.data = rowdata;
table.render(option);
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
index d9e7044..d8babea 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
@@ -342,9 +342,13 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鐢熶骇鐝粍-缂栬緫'
+ , title: '宸ュ簭宸ヤ环璧勬枡-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html?OperationType=3&linterid=' + linterid
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
--
Gitblit v1.9.1