From e372df7209ca5abcf3ddac45416433ae319afe41 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 30 九月 2021 15:50:15 +0800
Subject: [PATCH] 完善丸井改制的维修类型+增加雅琪诺扣补项目模块
---
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 | 4
WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html | 299 +++++++++++++++++++++++++++
WebTM/views/index.html | 2
WebTM/WebTM.csproj | 2
9 files changed, 613 insertions(+), 13 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0024f8f..0cfca3f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -553,6 +553,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 65518cb..b6681e6 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,12 +6,12 @@
//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://localhost/API/";
+ //var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 7d0add3..1540081 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>
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