From 821932bc0227ec31d33c7593e878e2916a5e7fa1 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期四, 30 九月 2021 16:53:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html | 6
WebTM/views/工资管理/Gy_DuSubsidyItemBillEdit.html | 260 ++++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html | 13
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html | 24
WebTM/views/工资管理/Gy_WorkPayTypeBillList.html | 6
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html | 16
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html | 753 +++++++++++++++++++++++++++++++
WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html | 299 ++++++++++++
WebTM/views/index.html | 5
WebTM/WebTM.csproj | 3
11 files changed, 1,371 insertions(+), 16 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d0c82b5..5e3e572 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -525,6 +525,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
@@ -553,6 +554,8 @@
<Content Include="views\鍩虹璧勬枡\杈呭姪鍩虹璧勬枡\Sb_Add_MaintenanceMode.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\Gy_DuSubsidyItemBillEdit.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\Gy_DuSubsidyItemBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkPayTypeBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkPayTypeBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillEdit.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 780c91d..05a6058 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//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/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 7d0add3..9a30c97 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -610,7 +610,7 @@
<dd>
<a>鎵ｈˉ璧勬枡</a>
<dl class="layui-nav-child">
- <dd><a lay-href="#">鎵ｈˉ璧勬枡</a></dd>
+ <dd><a lay-href="宸ヨ祫绠＄悊/Gy_DuSubsidyItemBillList.html">鎵ｈˉ宸ヨ祫璧勬枡缁存姢</a></dd>
</dl>
</dd>
<dd>
@@ -752,7 +752,8 @@
<dd>
<a>宸ヨ祫鍩虹璧勬枡</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡缁存姢</a></dd>
</dl>
</dd>
</dl>
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"
new file mode 100644
index 0000000..d663985
--- /dev/null
+++ "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"
@@ -0,0 +1,753 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ュ簭宸ヤ环璧勬枡</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px;">
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <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>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ュ簭浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎵�灞為儴闂�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--琛屾寜閽�-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(缁撹)-->
+ <script type="text/html" id="HCostFlagCol">
+ <select name="HCostFlagCol" lay-filter="HCostFlagCol" id="HCostFlagCol{{d.LAY_TABLE_INDEX+1}}">
+ <option value="鍚�">鍚�</option>
+ <option value="鏄�">鏄�</option>
+ </select>
+ </script>
+ <script type="text/html" id="HFlowFlagCol">
+ <select name="HFlowFlagCol" lay-filter="HFlowFlagCol" id="HFlowFlagCol{{d.LAY_TABLE_INDEX+1}}">
+ <option value="鍚�">鍚�</option>
+ <option value="鏄�">鏄�</option>
+ </select>
+ </script>
+ <script type="text/html" id="HPayFlagCol">
+ <select name="HPayFlagCol" lay-filter="HPayFlagCol" id="HPayFlagCol{{d.LAY_TABLE_INDEX+1}}">
+ <option value="鍚�">鍚�</option>
+ <option value="鏄�">鏄�</option>
+ </select>
+ </script>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鍏敤鍙橀噺
+ var rowdata;
+ var option = [];
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1.2;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ }
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1.1) {
+
+ }
+ else if (OperationType == 2) {
+
+ }
+ else if (OperationType == 3) {
+
+ }
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
+ "HProcNumberCol": "", "HProcNameCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+ "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "", "HFlowFlagCol": "", "HPayFlagCol": "",
+ "HRemarkCol": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HCostFlagCol' + i + '').find("option[value='" + option.data[i - 1].HCostFlagCol + "']").attr("selected", true);
+ $('#HFlowFlagCol' + i + '').find("option[value='" + option.data[i - 1].HFlowFlagCol + "']").attr("selected", true);
+ $('#HPayFlagCol' + i + '').find("option[value='" + option.data[i - 1].HPayFlagCol + "']").attr("selected", true);
+ }
+ form.render('select');
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HCostFlagCol' + i + '').find("option[value='" + option.data[i - 1].HCostFlagCol + "']").attr("selected", true);
+ $('#HFlowFlagCol' + i + '').find("option[value='" + option.data[i - 1].HFlowFlagCol + "']").attr("selected", true);
+ $('#HPayFlagCol' + i + '').find("option[value='" + option.data[i - 1].HPayFlagCol + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ break;
+ }
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btn-Exit)', function (data) {
+ get_Exit();
+ });
+
+ //鏂板鎸夐挳
+ form.on('submit(btn-AddNew)', function (data) {
+ window.location.reload();
+ });
+
+
+ //閫�鍑�
+ function get_Exit() {
+ if (OperationType == 1.1) {
+ Pub_Close(1);
+ } else if (OperationType == 1.2) {
+ Pub_Close(2);
+ } else if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ } else if (OperationType == 3) {
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ }
+ }
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HMaterCheck')
+ {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HMaterIDCol: checkStatus.data[0].HItemID
+ , HMaterNumberCol: checkStatus.data[0].HNumber
+ , HMaterNameCol: checkStatus.data[0].HName
+ , HMaterModelCol: checkStatus.data[0].HModel
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ }
+ });
+ }
+ if (obj.event == 'HProcCheck')
+ {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HProcIDCol: checkStatus.data[0].HItemID
+ , HProcNumberCol: checkStatus.data[0].宸ュ簭浠ｇ爜
+ , HProcNameCol: checkStatus.data[0].宸ュ簭
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ }
+ });
+ }
+ if (obj.event == 'HSourceCheck') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HSourceNumberCol: checkStatus.data[0].HNumber
+ , HSourceNameCol: checkStatus.data[0].HName
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(btnSave)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //淇濆瓨
+ function set_SaveBill(data) {
+ if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
+ layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+ layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HFirstCheckEmp").val() == 0) {
+ layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var sSubTable = table.cache['mainTable'];
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HQCCheckItemID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveBill",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.confirm(data.Message, {
+ // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ // btn2: function () {
+ // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ // parent.location.href = "../../../views/index.html"
+ // }//鍏抽棴
+ //}, function () { window.location.reload(); });//鏂板
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+
+ //琛ㄥご淇℃伅宸ュ簭寮圭獥
+ form.on('submit(btnSearchProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅浜у搧寮圭獥
+ form.on('submit(btnSearchMater)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+ form.on('submit(btnSearchDept)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ rowdata = [{
+ "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
+ "HProcNumberCol": "", "HProcNameCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+ "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "", "HFlowFlagCol": "", "HPayFlagCol": "",
+ "HRemarkCol": ""
+ }];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 'full-250'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox' }
+ , { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
+ , { field: 'HMaterNumberCol', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterCheck", width: 200 }
+ , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
+ , { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
+ , { field: 'HProcNumberCol', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
+ , { field: 'HProcNameCol', title: '宸ュ簭鍚嶇О' }
+ , { 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: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
+ , { field: 'HFlowFlagCol', title: '娴佽浆榛樿', templet: '#HFlowFlagCol' }
+ , { field: 'HPayFlagCol', title: '宸ヨ祫榛樿', templet: '#HPayFlagCol' }
+ , { field: 'HRemarkCol', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ $('.layui-form-select').find('input').unbind("blur");
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HCostFlagCol);
+ $cr.find('input').val(value.HFlowFlagCol);
+ $cr.find('input').val(value.HPayFlagCol);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ form.on('select(HCostFlagCol)', function (data) {
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HCostFlagCol = data.value;
+ }
+ });
+ });
+
+ form.on('select(HFlowFlagCol)', function (data) {
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HFlowFlagCol = data.value;
+ }
+ });
+ });
+
+ form.on('select(HPayFlagCol)', function (data) {
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HPayFlagCol = data.value;
+ }
+ });
+ });
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
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 153289a..d862d00 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"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ュ簭宸ヤ环璧勬枡</title>
+ <title>宸ュ簭宸ヤ环璧勬枡缁存姢</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -105,7 +105,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -327,7 +327,7 @@
, area: ['100%', '100%']
, title: '鐢熶骇璧勬簮-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+ , content: '../宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html?OperationType=1.1&linterid=&HSouceBillType='
})
}
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html"
new file mode 100644
index 0000000..98b8112
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html"
@@ -0,0 +1,260 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏂板/缂栬緫鎵ｈˉ璧勬枡</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <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="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>
+ </div>
+
+ </div>
+
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;"><b>鎵ｈˉ璧勬枡</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵ｈˉ璧勬枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵ｈˉ璧勬枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">娆� 搴�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSno" lay-verify="HSno" id="HSno">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绫� 鍨�</label>
+ <div class="layui-input-inline">
+ <select name="HType" lay-verify="HType" id="HType">
+ <option value="琛ヨ创" selected="selected">琛ヨ创</option>
+ <option value="鎵ｆ">鎵ｆ</option>
+ <option value="绀句繚">绀句繚</option>
+ <option value="绋庤垂">绋庤垂</option>
+ <option value="杈呭姪">杈呭姪</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀛楁鎻忚堪</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCaption" lay-verify="HCaption" id="HCaption">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀛楁鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSQLColumnName" lay-verify="HSQLColumnName" id="HSQLColumnName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀛楁绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HDataType" lay-verify="HDataType" id="HDataType">
+ <option value="瀛楃" selected="selected">瀛楃</option>
+ <option value="瀹炴暟">瀹炴暟</option>
+ <option value="閲戦">閲戦</option>
+ <option value="閫昏緫">閫昏緫</option>
+ <option value="鏃ユ湡">鏃ユ湡</option>
+ <option value="鏁存暟">鏁存暟</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿鍊�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDefaultValue" lay-verify="HDefaultValue" id="HDefaultValue">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //甯歌鐢ㄦ硶
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ //#endregion
+
+ //#region 澶撮儴宸ュ叿鏍忎簨浠�
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+ data.field.HItemID = linterid == "" ? 0 : linterid;
+
+ var oMain = JSON.stringify(data.field)
+ var sMainSub = oMain + ';' + linterid;
+
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_DuSubsidyItemBill/SaveGetGy_DuSubsidyItemBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+ //#endregion
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+
+ //缂栬緫鑾峰彇琛ㄥご鏁版嵁
+ function set_EditFromGrid(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "Gy_DuSubsidyItemBill/xg",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ console.log(result);
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ $("#HNumber").val(result.data[0].HNumber);
+ $("#HName").val(result.data[0].HName);
+ $("#HHelpCode").val(result.data[0].HHelpCode);
+ $("#HRemark").val(result.data[0].HRemark);
+ $("input[name='HStopflag']").prop("checked", result.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+ $("#HSno").val(result.data[0].HSno);
+ $("#HType").val(result.data[0].HType);
+ $("#HCaption").val(result.data[0].HCaption);
+ $("#HSQLColumnName").val(result.data[0].HSQLColumnName);
+ $("#HDataType").val(result.data[0].HDataType);
+ $("#HDefaultValue").val(result.data[0].HDefaultValue);
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
new file mode 100644
index 0000000..4309c2f
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
@@ -0,0 +1,299 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鎵ｈˉ璧勬枡</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/treeTable.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+
+ .layui-form-label {
+ width: 40px;
+ padding: 9px 5px;
+ }
+
+ .layui-input-block {
+ margin-left: 50px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div style="padding: 10px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ </div>
+
+ <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
+ <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
+ </div>
+ <div class="layui-col-xs12 layui-inline">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ // #region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞
+
+ //鍒濆鍖栬〃鏍�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂板
+ form.on('submit(btnAdd)', function (obj) {
+ set_AddNew(obj);
+ })
+
+ //淇敼
+ form.on('submit(btnModify)', function (data) {
+ set_ShowBill(data);
+ });
+
+ //鍒犻櫎
+ form.on('submit(btndelete)', function (obj) {
+ set_DeleteBill(obj);
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and 鎵ｈˉ璧勬枡浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 鎵ｈˉ璧勬枡鍚嶇О like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //鍒濆鍖栬〃鏍�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '鎵ｈˉ璧勬枡浠ｇ爜', title: '鎵ｈˉ璧勬枡浠ｇ爜' }
+ , { field: '鎵ｈˉ璧勬枡鍚嶇О', title: '鎵ｈˉ璧勬枡鍚嶇О' }
+ , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { field: '搴忓彿', title: '搴忓彿' }
+ , { field: '绫诲瀷', title: '绫诲瀷' }
+ , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+ ]]
+ };
+ }
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_DuSubsidyItemBill/Gy_DuSubsidyItemlist',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏂板
+ function set_AddNew(obj) {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鎵ｈˉ璧勬枡',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../宸ヨ祫绠＄悊/Gy_DuSubsidyItemBillEdit.html?OperationType=1&linterid=&HSouceBillType='],
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
+ }
+
+ //淇敼
+ function set_ShowBill(data) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鎵ｈˉ璧勬枡'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ヨ祫绠＄悊/Gy_DuSubsidyItemBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //鍒犻櫎
+ function set_DeleteBill(obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_DuSubsidyItemBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
index 1c049af..47ad782 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
@@ -163,8 +163,8 @@
, cols: [[
{ type: 'radio', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '宸ヨ祫绫诲瀷浠ｇ爜', title: '宸ョ浠ｇ爜' }
- , { field: '宸ヨ祫绫诲瀷鍚嶇О', title: '宸ョ鍚嶇О' }
+ , { field: '宸ヨ祫绫诲瀷浠ｇ爜', title: '宸ヨ祫绫诲瀷浠ｇ爜' }
+ , { field: '宸ヨ祫绫诲瀷鍚嶇О', title: '宸ヨ祫绫诲瀷鍚嶇О' }
, { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
, { field: '澶囨敞', title: '澶囨敞' }
, { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
@@ -229,7 +229,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫宸ョ'
+ , title: '缂栬緫璧勬枡绫诲瀷'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
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 bf46734..5813603 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"
@@ -171,7 +171,7 @@
<div class="layui-input-block">
<select name="HRepairType" lay-filter="aihao" id="HRepairType">
<option value="鍐呴儴缁翠慨" selected="selected">鍐呴儴缁翠慨</option>
- <option value="澶栭儴缁翠慨">澶栭儴缁翠慨</option>
+ <option value="濮斿缁翠慨">濮斿缁翠慨</option>
</select>
</div>
</div>
@@ -809,6 +809,17 @@
, "HExplanation": data.鏀瑰埗瑕佹眰 //鎽樿
, "HRepairContent": data.鏀瑰埗鍐呭
, "HRemark": data.澶囨敞 //澶囨敞
+ //=========================================================
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : formatDate(data.鍒跺崟鏃ユ湡)
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : formatDate(data.鍏抽棴鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
});
} else {
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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
index 8922471..825d45e 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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
@@ -138,9 +138,9 @@
<div class="layui-inline">
<label class="layui-form-label">缁翠慨绫诲瀷</label>
<div class="layui-input-inline">
- <select name="RepairType" id="RepairType">
- <option value="0" selected="selected">鍐呴儴缁翠慨</option>
- <option value="1">澶栭儴缁翠慨</option>
+ <select name="HRepairType" id="HRepairType">
+ <option value="鍐呴儴缁翠慨" selected="selected">鍐呴儴缁翠慨</option>
+ <option value="澶栭儴缁翠慨">澶栭儴缁翠慨</option>
</select>
</div>
</div>
@@ -808,7 +808,11 @@
function set_InitFrom() {
laydate.render({
elem: '#HDate'
- , elem:'#HMakeDate'
+ , elem: '#HMakeDate'
+ , elem: '#HCheckDate'
+ , elem: '#HCloseDate'
+ , elem: '#HUpDateDate'
+ , elem: '#HDeleteDate'
});
}
//鍒濆鍖栬〃鏍�
@@ -898,6 +902,7 @@
, "HKeeperName": data.淇濈鍛�
, "HSupID": data.HSupID
, "HSupName": data.缁翠慨鍗曚綅
+ , "HRepairType": data.缁翠慨绫诲瀷
, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
, "HSecManagerName": data.楠屾敹鍛� //楠屾敹鍛樺悕绉�
, "HManagerID": data.HManagerID
@@ -911,6 +916,17 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.澶囨敞 //澶囨敞
+ //=========================================================
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null?"": formatDate(data.鍒跺崟鏃ユ湡)
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" :formatDate(data.鍏抽棴鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
});
} else {
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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
index 7a3cbe2..cb13e2e 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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
@@ -140,8 +140,8 @@
<label class="layui-form-label">缁翠慨绫诲瀷</label>
<div class="layui-input-inline">
<select name="HRepairType" id="HRepairType">
- <option value="0" selected="selected">鍐呴儴缁翠慨</option>
- <option value="1">澶栭儴缁翠慨</option>
+ <option value="鍐呴儴缁翠慨" selected="selected">鍐呴儴缁翠慨</option>
+ <option value="澶栭儴缁翠慨">澶栭儴缁翠慨</option>
</select>
</div>
</div>
@@ -899,6 +899,7 @@
, "HKeeperName": data.淇濈鍛�
, "HSupID": data.HSupID
, "HSupName": data.缁翠慨鍗曚綅
+ , "HRepairType": data.缁翠慨绫诲瀷
, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
, "HSecManagerName": data.楠屾敹鍛� //楠屾敹鍛樺悕绉�
, "HManagerID": data.HManagerID
@@ -912,6 +913,17 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.澶囨敞 //澶囨敞
+ //=========================================================
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : formatDate(data.鍒跺崟鏃ユ湡)
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : formatDate(data.鍏抽棴鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
});
} else {
--
Gitblit v1.9.1