From 872a220c9ec608daad0b58d08ce164137d847880 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 08 十一月 2021 08:30:58 +0800
Subject: [PATCH] 公告信息编辑 保存
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html | 16 +
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldProdInStockBill.aspx | 4
WebTM/views/系统管理/公告/GG_NoticeBillEdit.html | 107 +++++++++------
WebTM/views/系统管理/公告/GG_NoticeBillList.html | 8
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldProdInStockBill.aspx.designer.cs | 2
WebTM/views/PublicPage/PeopleInformations.html | 218 +++++++++++++++++++++++++++++++
WebTM/views/index.html | 6
WebTM/WebTM.csproj | 1
8 files changed, 304 insertions(+), 58 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fc5feef..83f984c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -113,6 +113,7 @@
<Content Include="views\PublicPage\CheckItemInformation.html" />
<Content Include="views\PublicPage\Gy_Maintain.html" />
<Content Include="views\PublicPage\Organizations.html" />
+ <Content Include="views\PublicPage\PeopleInformations.html" />
<Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
diff --git a/WebTM/views/PublicPage/PeopleInformations.html b/WebTM/views/PublicPage/PeopleInformations.html
new file mode 100644
index 0000000..2a0f5c3
--- /dev/null
+++ b/WebTM/views/PublicPage/PeopleInformations.html
@@ -0,0 +1,218 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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
+ }
+ </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 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="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; 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 src="../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var TreeFlag = true;//鎿嶄綔绫诲瀷
+ } else {
+ var TreeFlag = params[params[0]];//鎿嶄綔绫诲瀷
+ }
+
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ 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 sWhere1 = "where 1=1"; //鍒楄〃
+
+
+
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HNumber', title: '鐢ㄦ埛浠ｇ爜' }
+ , { field: 'HName', title: '鐢ㄦ埛鍚嶇О' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/PeopleList',
+ type: "GET",
+ data: { "sWhere": SeachFilter(sWhere1) },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/PeopleList',
+ type: "GET",
+ data: { "sWhere": SeachFilter(sWhere1) },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ /*layer.alert("鏌ヨ鎴愬姛", { icon: 1 });*/
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ //鏌ヨ鏍戠姸鏁版嵁
+ function getData(sWhere) {
+ var treeData;
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ async: false,
+ success: function (result) {
+ var data = result.data;
+ //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ treeData = LoadTree(data);
+
+ }
+ });
+ return treeData;
+ }
+ /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+ function LoadTree(data) {
+ let map = {};
+ let treeData = [];
+ data.forEach(it => {
+ map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ })
+ //鐢熸垚缁撴灉闆�
+ data.forEach(it => {
+ const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ if (parent) {
+ if (!Array.isArray(parent.children)) parent.children = [];
+ parent.children.push(it);
+ } else {
+ treeData.push(it)
+ }
+ })
+ return treeData;
+ }
+
+ function SeachFilter(sWhere1) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ sWhere1 = " where 1=1 ";
+ if (HNumber) {
+ sWhere1 += " and czybm like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere1 += " and czymc like '%" + HName + "%'";
+ }
+ return sWhere1;
+ }
+
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 2fdc4b8..9c013e9 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -807,10 +807,8 @@
<dd><a lay-href="绯荤粺绠＄悊/妯″潡绠＄悊/Xt_XtgnbList.html">绯荤粺妯″潡淇℃伅鏌ヨ</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">绯荤粺鍗曟嵁绫诲瀷鏌ヨ</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">浼氳鏈熼棿鏌ヨ</a></dd>
- <dd><a lay-href="绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">鍏憡淇℃伅</a></dd>
- <dd><a lay-href="绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">鍏憡淇℃伅缁存姢</a></dd>
- <dd><a lay-href="GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
- <dd><a lay-href="GG_NoticeBillList.html">鍏憡缁存姢</a></dd>
+ <dd><a lay-href="绯荤粺绠＄悊/鍏憡/GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
+ <dd><a lay-href="绯荤粺绠＄悊/鍏憡/GG_NoticeBillList.html">鍏憡淇℃伅缁存姢</a></dd>
</dl>
</dd>
<dd>
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/xmlLBM_MouldProdInStockBill.aspx" "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/xmlLBM_MouldProdInStockBill.aspx"
index b9deda6..1bd24d7 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/xmlLBM_MouldProdInStockBill.aspx"
+++ "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/xmlLBM_MouldProdInStockBill.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldProdInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill1" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldProdInStockBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldProdInStockBill" %>
<!DOCTYPE html>
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldProdInHouseBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldProdInHouseBillList where hmainid=" + Request.Params["linterid"]+ " order by hmainid");
}
</script>
</head>
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/xmlLBM_MouldProdInStockBill.aspx.designer.cs" "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/xmlLBM_MouldProdInStockBill.aspx.designer.cs"
index 34c0a50..12094c1 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/xmlLBM_MouldProdInStockBill.aspx.designer.cs"
+++ "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/xmlLBM_MouldProdInStockBill.aspx.designer.cs"
@@ -11,7 +11,7 @@
{
- public partial class xmlLBM_MouldProdInStockBill1
+ public partial class xmlLBM_MouldProdInStockBill
{
/// <summary>
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_MouldProdInBillList.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_MouldProdInBillList.html"
index 37e7a67..f8991d4 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_MouldProdInBillList.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_MouldProdInBillList.html"
@@ -405,12 +405,16 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
- //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- //window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
-
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
index a673665..1f47b50 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
@@ -38,16 +38,22 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">涓婚<label style="color:red"> * </label></label>
+ <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input id="HInterID" name="HInterID" type="hidden" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓婚<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -57,19 +63,19 @@
<input type="hidden" name="HDeptID" id="HDeptID" readonly class="layui-input">
</div>
</div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鍙戦�佷汉<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSendMan" id="HSendMan" readonly class="layui-input" value="" style="float:left;width:150px;">
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎺ユ敹浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HReceiveMan" id="HReceiveMan" readonly class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -77,7 +83,7 @@
<div class="layui-inline">
<label class="layui-form-label">绱ф�ョ▼搴�</label>
<div class="layui-input-inline">
- <select name="HLevel" id="HLevel" lay-filter="HLevel" class="layui-input" value="" style="float:left;width:150px">
+ <select name="HLevel" id="HLevel" lay-filter="HLevel" class="layui-input" style="float:left;width:150px">
<option value="0">鏅��</option>
<option value="1">绱ф��</option>
</select>
@@ -86,7 +92,7 @@
<div class="layui-inline">
<label class="layui-form-label">璇︾粏鍐呭<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HDescription" id="HDescription" style="width:480px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HDescription" id="HDescription"></textarea>
</div>
</div>
</div>
@@ -118,7 +124,8 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HEntryID = params[params[2]];//婧愬崟id
+ var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷
}
@@ -136,19 +143,18 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ var sBillType = "4506";
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
- set_EditFromGrid(linterid);
+ set_EditForm(linterid);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -158,7 +164,7 @@
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
//琛ㄥご鎺ユ敹浜哄脊绐�
- form.on('submit(HManagerList)', function () {
+ form.on('submit(HReceiveManList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -168,7 +174,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/PeopleInformation.html', 'yes'],
+ content: ['../../PublicPage/PeopleInformations.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -184,9 +190,10 @@
}
//鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
if (str.length > 0) {
- tr = str.substr(0, str.length - 1);
+ str = str.substr(0, str.length - 1);
}
- $("#HManagerName").val(str);
+
+ $("#HReceiveMan").val(str);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -213,13 +220,14 @@
if (linterid != "" && linterid != null) {
refSav = "Update";
}
- var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
- var sSubStr = data.field.HReceiveMan.substring(str1.indexOf(",") + 1, str1.indexOf(","));
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ var sMainStr = JSON.stringify(data.field);
+ var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ console.log(sMainSub);
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
}
+
$.ajax(
{
type: "POST",
@@ -272,46 +280,60 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
//鑾峰彇鏃ユ湡
+
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); //鏃ユ湡
$("#HDept").val(sessionStorage["HDept"]); //閮ㄩ棬
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HSendMan").val(sessionStorage["HUserName"]); //褰撳墠鐧诲綍鐢ㄦ埛
}
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ function get_MAXNum() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": sBillType },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ }
+ });
+ }
+
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai",
+ url: GetWEBURL() + "GG_Notice/GG_NoticeBillListCheckDetai",
type: "GET",
data: {
- "HID": linterid
+ "HID": linterid,
+ "HEntryID": HEntryID
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldScrapInHouseBillList[0];
+ var data = result.data.OA_InformBillMain[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
- , "HWHName": data.浠撳簱鍚嶇О //浠撳簱鍚嶇О
- , "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
- , "HSecManagerName": data.楠屾敹鍛樺悕绉� //楠屾敹鍛樺悕绉�
- , "HKeeperID": data.HKeeperID //淇濈鍛業D
- , "HKeeperName": data.淇濈鍛樺悕绉� //淇濈鍛樺悕绉�
- , "HManagerID": data.HManagerID //璐熻矗浜篒D
- , "HManagerName": data.璐熻矗浜哄悕绉� //璐熻矗浜哄悕绉�
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬鍚嶇О //閮ㄩ棬鍚嶇О
- , "HSourceBillType": "" //婧愬崟绫诲瀷
- , "XDH": "" //閫夊崟鍙�
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.澶囨敞 //澶囨敞
- , "HSupTypeID": data.寰�鏉ョ被鍨� //閫夊崟鍙�
- , "HSupName": data.寰�鏉ュ崟浣� //鎽樿
- , "HSupID": data.HSupID //澶囨敞
+ "HBillNo": data.HBillNo
+ , "HInterID": data.HInterID
+ , "HDate": formatDate(data.HDate)
+ , "HContext": data.HContext
+ , "HDeptID": data.HDeptID
+ , "HDept": data.HDeptName
+ , "HSendMan": data.HSendMan
+ , "HReceiveMan": data.HReceiveMan
+ //, "HLevel": data.HLevel
+ , "HDescription": data.HDescription
});
+ $('#HLevel').find('option:contains(' + data.HLevel + ')').attr('selected', true);
+ layui.form.render('select','component-form-group')
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -321,6 +343,7 @@
}
});
}
+
//鏃ユ湡鏍煎紡鍖�
function formatDate(date) {
var d = new Date(date),
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
index 0defd71..b0b7adb 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
@@ -177,6 +177,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'HInterID', title: '涓诲唴鐮�', width: 200, hide: true }
, { field: 'HEntryID', title: '瀛愬唴鐮�', width: 200, hide: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200 }
, { field: 'HContext', title: '涓婚', width: 200 }
, { field: 'HDeptName', title: '鍙戦�侀儴闂�', width: 200 }
, { field: 'HSendMan', title: '鍙戦�佷汉', width: 110 }
@@ -237,7 +238,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html?OperationType=1&linterid=&HSouceBillType=',
+ content: 'GG_NoticeBillEdit.html?OperationType=1&linterid=&HEntryID=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
get_FastQuery(table, option);
@@ -253,7 +254,8 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var linterid = data[0].hmainid.toString();
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -263,7 +265,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: 'GG_NoticeBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: 'GG_NoticeBillEdit.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID+'&HSouceBillType='
, resize: false,
end: function () {
get_FastQuery(table, option);
--
Gitblit v1.9.1