From 52125b659cdc2a15a3e81b68f6d1f833f7cdd322 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期四, 29 八月 2024 15:08:17 +0800
Subject: [PATCH] 111
---
WebTM/views/home/console.html | 10
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 39 ++
WebTM/views/home/announcement.html | 205 ++++++++++++++
WebTM/views/质量管理/工作联系单/OA_Add_Edit_WorkLinkBill.html | 11
WebTM/views/indexMenu.html | 17
WebTM/views/user/login.html | 30 +
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/home/console111.html | 482 ++++++++++++++++++++++++++++++++++
WebTM/WebTM.csproj | 4
9 files changed, 773 insertions(+), 29 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 656c2ba..af8bf75 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -203,6 +203,8 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
+ <Content Include="views\home\announcement.html" />
+ <Content Include="views\home\console.html" />
<Content Include="views\home\console_KaiBeiNaiTe.html" />
<Content Include="views\home\console_Mobile_KaiBeiNaiTe.html" />
<Content Include="views\home\console_pb.html" />
@@ -1383,7 +1385,7 @@
<Content Include="views\GRInstall.js" />
<Content Include="views\GRUtility.js" />
<Content Include="views\home\console_Mobile.html" />
- <Content Include="views\home\console.html" />
+ <Content Include="views\home\console111.html" />
<Content Include="views\home\homepage1.html" />
<Content Include="views\home\homepage2.html" />
<Content Include="views\iframe\layer\iframe.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 9b92e50..9078ac7 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ // var WEBURL = "http://localhost/API/"; // //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
- /*var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
+ var WEBURL = "http://localhost/API/"; // 娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
diff --git a/WebTM/views/home/announcement.html b/WebTM/views/home/announcement.html
new file mode 100644
index 0000000..9b3b5c2
--- /dev/null
+++ b/WebTM/views/home/announcement.html
@@ -0,0 +1,205 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title></title>
+</head>
+<body>
+ <!--椤甸潰鏍峰紡-->
+ <style>
+ .welcome .layui-card {
+ border: 1px solid #f2f2f2;
+ border-radius: 5px;
+ }
+
+ .welcome .layuimini-notice:hover {
+ background: #f6f6f6;
+ }
+
+ .welcome .layuimini-notice {
+ padding: 7px 16px;
+ clear: both;
+ font-size: 12px !important;
+ cursor: pointer;
+ position: relative;
+ transition: background 0.2s ease-in-out;
+ }
+
+ .welcome .layuimini-notice-title {
+ padding-right: 70px !important;
+ text-overflow: ellipsis !important;
+ overflow: hidden !important;
+ white-space: nowrap !important;
+ }
+
+ .welcome .layuimini-notice-title {
+ line-height: 28px;
+ font-size: 14px;
+ }
+
+ .welcome .layuimini-notice-extra {
+ position: absolute;
+ top: 50%;
+ margin-top: -8px;
+ right: 16px;
+ display: inline-block;
+ height: 16px;
+ color: #999;
+ }
+ </style>
+ <div class="layuimini-container layuimini-page-anim">
+ <div class="layuimini-main welcome">
+ <div class="layui-row layui-col-space20">
+ <div class="layui-col-md12">
+ <div class="layui-row layui-col-space15">
+
+ <!--绯荤粺鍏憡-->
+ <div class="layui-col-md6">
+ <div class="layui-card">
+ <div class="layui-card-header"><i class="fa fa-bullhorn icon icon-tip"></i>绯荤粺鍏憡</div>
+ <div class="layui-card-body layui-text">
+
+ <!-- 绯荤粺鍏憡鐨勯�氱煡璇︽儏 -->
+ <div id="notice" class="layui-card">
+ <!-- 瀛樻斁妯℃澘鐨剆cript鏍囩 -->
+ <script type="text/html" id="noticeTemplate">
+ <!-- 浣跨敤layui鐨別ach寰幆, 閬嶅巻鏁版嵁闆嗗悎淇℃伅(娉ㄦ剰: 杩欓噷涓�瀹氳浣跨敤d.data; 鍙傛暟index琛ㄧず闆嗗悎涓嬫爣, item琛ㄧず闆嗗悎鍏冪礌) -->
+ {{# layui.each(d.data,function(index,item){ }}
+ <div class="layuimini-notice">
+ <!-- class閫夋嫨鍣ㄤ负"layuimini-notice-title"鐨刣iv鐩掑瓙鐢ㄤ簬瀛樺偍鍏憡閫氱煡涓殑鏍囬 -->
+ <!-- 鍒ゆ柇褰撳墠鍏冪礌涓嬫爣鏄惁浣嶄簬闆嗗悎鐨勫墠涓や綅, 鑻ヤ负鍓嶄袱浣�, 鍒欏湪杩愬姩浼氬悕绉板悗鍔犱笂new鐨勫瓧鏍� -->
+ {{# if(index<=1) { }}
+ <!-- 閬嶅巻姣忎釜鍏冪礌鍊煎潎浣跨敤 {{ item.瀛楁鍚� }} 鏍煎紡(娉ㄦ剰: {{鍚庢棤闇�鍔�#鍙�) -->
+ <div class="layuimini-notice-title">{{ item.sportName }}鎶ュ悕寮�鍚� <span class="label layui-bg-red">new</span></div>
+ {{# } else { }}
+ <!-- 鑻ュ綋鍓嶅厓绱犱笅鏍囦笉浣嶄簬闆嗗悎涓殑鍓嶄袱浣�, 鍒欐棤闇�鏄剧ずnew瀛楁牱 -->
+ <div class="layuimini-notice-title">{{ item.sportName }}鎶ュ悕寮�鍚�</div>
+ {{# } }}
+ <!-- class閫夋嫨鍣ㄤ负"layuimini-notice-extra"鐨刣iv鐩掑瓙鐢ㄤ簬瀛樺偍鍏憡閫氱煡涓殑鍙戝竷鏃堕棿 -->
+ <div class="layuimini-notice-extra">{{ item.createTime }}</div>
+ <!-- class閫夋嫨鍣ㄤ负"layuimini-notice-content"鐨刣iv鐩掑瓙鐢ㄤ簬瀛樺偍鍏憡閫氱煡鐨勫叿浣撳唴瀹�, 浣跨敤layui-hide灏嗗唴瀹归殣钘�, 鍦ㄦ煡鐪嬭鎯呮椂灞曠ず -->
+ <div class="layuimini-notice-content layui-hide">
+ <!-- 浠嶆棫鏄亶鍘嗘瘡涓厓绱犲��, 涔熸槸浣跨敤 {{ item.瀛楁鍚� }} 鐨勬牸寮� -->
+ <span style="font-size:14px;font-weight: bolder;color: #000000">杩愬姩浼氬悕锛�</span>{{ item.sportName }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">涓惧姙鍦哄湴锛�</span>{{ item.place }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">涓惧姙鏂癸細</span>{{ item.holder }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">涓惧姙鏃堕棿锛�</span>{{ item.startTime}} 鑷� {{ item.endTime }} <br>
+ <span style="font-size:14px;font-weight: bolder;color: #000000">璇︽儏鎻忚堪锛�</span>{{ item.description }} <br>
+ </div>
+ </div>
+ <!-- 寰幆缁撴潫璁板緱鍔犱笂杩欎釜 -->
+ {{# }); }}
+ </script>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ /* 鍔犺浇layer,form鍜宼able绛夊疄渚� */
+ layui.use(['layer', 'jquery', 'laytpl'], function () {
+ // 鑾峰彇jquery瀵硅薄
+ var $ = layui.jquery,
+ // 鑾峰彇layer瀵硅薄
+ layer = layui.layer,
+ // 鑾峰彇laytpl瀵硅薄
+ laytpl = layui.laytpl;
+
+ // 宸插彂甯冪殑杩愬姩浼氫俊鎭�
+ let sportInfoList;
+ /* 缂栧啓鑾峰彇宸插彂甯冪殑杩愬姩浼氫俊鎭殑ajax璇锋眰 */
+ $.ajax({
+ // 璇锋眰鏂瑰紡涓篏ET
+ type: 'GET',
+ // 鏁版嵁鎺ュ彛锛氳姹侸SON鏁版嵁鍒板悗绔�
+ url: GetWEBURL() + '/GG_Notice/notices',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"] },
+ // 寮�鍚悓姝�
+ async: false,
+ /* 澶勭悊璇锋眰鐨勫洖璋冨嚱鏁� */
+ success: function (res) {
+ // 鑻ヨ繑鍥炵殑鐘舵�佺爜涓�0锛屽垯鎵ц鎴愬姛澶勭悊鎿嶄綔
+ if (res.count == 1) {
+ // 杩愬姩浼氫俊鎭负褰撳墠鏁版嵁
+ sportInfoList = res.data;
+ // console.log(sportInfoList);
+ // 鑻ヨ繑鍥炵殑鐘舵�佺爜涓�1锛屽垯鎵ц澶辫触澶勭悊鎿嶄綔
+ } else {
+ layer.msg('鑾峰彇宸插彂甯冪殑杩愬姩浼氫俊鎭け璐ワ紒', { icon: 2 });
+ }
+ }
+ });
+
+ // 鑾峰彇閫氱煡妯℃澘涓殑html椤甸潰浠ｇ爜(noticeTemplate瀵瑰簲script妯℃澘涓殑id閫夋嫨鍣�)
+ let noticeTpl = noticeTemplate.innerHTML,
+ // 鏍规嵁id閫夋嫨鍣ㄥ畾浣嶅埌鍏憡閫氱煡鐨刣iv鐩掑瓙
+ notice = document.getElementById('notice');
+ // console.log(sportInfoList);
+ //娓叉煋妯℃澘淇℃伅(noticeTpl鏄ā鏉垮紩鎿庣殑html浠ｇ爜, sportInfoList鏄笂闈㈣幏鍙栧埌鐨勫凡鍙戝竷杩愬姩浼氫俊鎭�, html鐢ㄤ簬瀛樺偍div鐩掑瓙涓殑浠ｇ爜)
+ laytpl(noticeTpl).render(sportInfoList, function (html) {
+ // 鑾峰彇妯℃澘寮曟搸涓殑html浠ｇ爜, 灏嗗叾璧嬪�煎埌html鍙傛暟涓幓
+ notice.innerHTML = html;
+ });
+
+ /**
+ * 鏌ョ湅鍏憡璇︽儏淇℃伅鐨勭偣鍑讳簨浠�
+ **/
+ $('body').on('click', '.layuimini-notice', function () {
+ // 鑾峰彇鍏憡閫氱煡涓殑鏍囬鏂囨湰(鐢变簬鍓嶄袱鏉℃暟鎹殑鏍囬鍚庨潰瀛樺湪new瀛楁牱, 杩欓噷灏嗗叾杩涜鏇挎崲
+ var title = $(this).children('.layuimini-notice-title').text().replace("new", ""),
+ // 鑾峰彇鍏憡閫氱煡涓殑鍙戝竷鏃堕棿
+ noticeTime = $(this).children('.layuimini-notice-extra').text(),
+ // 鑾峰彇鍏憡閫氱煡涓殑閫氱煡璇︽儏
+ content = $(this).children('.layuimini-notice-content').html();
+ // 缁樺埗鍏憡閫氱煡璇︽儏鐨刪tml椤甸潰(鍏朵腑\n鐢ㄤ簬鎹㈣)
+ var html = '<div style="padding:15px 20px; text-align:justify; line-height: 22px;border-bottom:1px solid #e2e2e2;background-color: #ffffff;color: #000000">\n' +
+ '<div style="text-align: center;margin-bottom: 20px;font-weight: bold;border-bottom:1px solid #718fb5;padding-bottom: 5px">\n' +
+ '<h3 class="text-danger" style="font-size:16px;font-weight:bolder;color:red;">' + title + '</h3></div>\n' +
+ '<div style="font-size: 15px">' + content + '</div>\n' +
+ '</div>\n';
+ // 鎵撳紑鍏憡閫氱煡椤甸潰
+ parent.layer.open({
+ // 绫诲瀷涓洪〉闈㈠眰
+ type: 1,
+ // 璁剧疆鍏憡閫氱煡鏍囬
+ title: ['绯荤粺鍏憡' + '<span style="float: right;right: 1px;font-size: 14px;color: #b1b3b9;margin-top: 1px">' + noticeTime + '</span>', 'font-size:18px;'],
+ // 璁剧疆椤甸潰鐨勫楂�
+ area: ['500px', '500px'],
+ // 寮�鍚伄缃╂晥鏋�
+ shade: 0.3,
+ // 瀵瑰簲鍏憡閫氱煡div鏍囩鐨刬d
+ id: 'layuimini-notice',
+ // 寮瑰嚭妗嗙殑鎸夐挳
+ btn: ['鏌ョ湅', '鍙栨秷'],
+ // 鎸夐挳鎺掑垪涓哄眳涓榻�
+ btnAlign: 'c',
+ // 绐楀彛鎷栨嫿绫诲瀷
+ moveType: 1,
+ // 椤甸潰鍐呭涓轰笂闈㈢粯鍒剁殑鍏憡閫氱煡璇︽儏
+ content: html,
+ // 璇锋眰鎴愬姛鐨勫洖璋冨嚱鏁�(鍏朵腑layero琛ㄧず鎵撳紑鐨勫脊鍑哄眰椤甸潰)
+ success: function (layero) {
+ // 棣栧厛鍦ㄥ脊鍑哄眰椤甸潰涓畾浣峛tn鎸夐挳
+ var btn = layero.find('.layui-layer-btn');
+ // 鐒跺悗鏍规嵁btn鎸夐挳缁х画瀹氫綅绗竴涓猙tn(鍗虫煡鐪�)鎸夐挳
+ btn.find('.layui-layer-btn0').attr({
+ // 璁剧疆鐐瑰嚮鎸夐挳鍚庤烦杞湴鍧�
+ href: 'https://gitee.com/zhongshaofa/layuimini',
+ // 鎵撳紑鏂瑰紡涓哄綋鍓嶉〉
+ target: '_self'
+ });
+ }
+ });
+ });
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 21861e1..5510b29 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -266,6 +266,8 @@
, table = layui.table
, form = layui.form
, element = layui.element
+ , tr = layui.tr
+ , td = layui.td
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
@@ -273,7 +275,7 @@
var $ = layui.jquery;
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�"];
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�", "鎺ユ敹浜�"];
//鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
var HType = "PC";
@@ -409,12 +411,12 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 75 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'MM-dd')}}</div>", width: 100 });
break;
case 'String':
- if (data[i].id == '绱ф�ョ▼搴�') {
+ if (data[i].id == '鐘跺喌') {
col.push({
- field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 70``
+ field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 80
});
break;
}
diff --git a/WebTM/views/home/console111.html b/WebTM/views/home/console111.html
new file mode 100644
index 0000000..ee6e0f3
--- /dev/null
+++ b/WebTM/views/home/console111.html
@@ -0,0 +1,482 @@
+锘�<!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 id="LAY_layadmin_theme" type="text/css">
+ .layui-side-menu, .layadmin-pagetabs .layui-tab-title li:after, .layadmin-pagetabs .layui-tab-title li.layui-this:after, .layui-layer-admin .layui-layer-title, .layadmin-side-shrink .layui-side-menu .layui-nav > .layui-nav-item > .layui-nav-child {
+ background-color: #20222A !important;
+ }
+
+ .layui-nav-tree .layui-this, .layui-nav-tree .layui-this > a, .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a {
+ background-color: #009688 !important;
+ }
+
+ .layui-layout-admin .layui-logo {
+ background-color: #20222A !important;
+ }
+
+ .layui-table-body.layui-table-main {
+ height: 400px;
+ }
+
+ .layui-table-box {
+ height: 400px;
+ }
+ .welcome .layui-card {
+ border: 1px solid #f2f2f2;
+ border-radius: 5px;
+ }
+
+ .welcome .layuimini-notice:hover {
+ background: #f6f6f6;
+ }
+
+ .welcome .layuimini-notice {
+ padding: 7px 16px;
+ clear: both;
+ font-size: 12px !important;
+ cursor: pointer;
+ position: relative;
+ transition: background 0.2s ease-in-out;
+ }
+
+ .welcome .layuimini-notice-title {
+ padding-right: 70px !important;
+ text-overflow: ellipsis !important;
+ overflow: hidden !important;
+ white-space: nowrap !important;
+ }
+
+ .welcome .layuimini-notice-title {
+ line-height: 28px;
+ font-size: 14px;
+ }
+
+ .welcome .layuimini-notice-extra {
+ position: absolute;
+ top: 50%;
+ margin-top: -8px;
+ right: 16px;
+ display: inline-block;
+ height: 16px;
+ color: #999;
+ }
+ </style>
+ <script>
+ /^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
+ </script>
+
+</head>
+<body layadmin-themealias="default">
+ <div class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md8">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md6">
+ <!-- 蹇嵎鏂瑰紡 -->
+ <div class="layui-card">
+ <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <!--蹇嵎鏂瑰紡-->
+ <div class="FastMenu" carousel-item=""></div>
+ <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+ <!-- 蹇嵎鏂瑰紡 -->
+ <div class="layui-card">
+ <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <div carousel-item="">
+ <ul class="layui-row layui-col-space10 layui-this">
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-console"></i>
+ <cite>澶栬喘鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-engine"></i>
+ <cite>濮斿鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite>浜у搧鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-chart"></i>
+ <cite>棰嗘枡鍑哄簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-unlink"></i>
+ <cite>濮斿鍑哄簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-chat"></i>
+ <cite>閿�鍞嚭搴�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-component"></i>
+ <cite>璋冩嫧鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-app"></i>
+ <cite>鏉＄爜鐢熸垚</cite>
+ </a>
+ </li>
+ </ul>
+ <ul class="layui-row layui-col-space10">
+ <li class="layui-col-xs3">
+ <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template"></i>
+ <cite>涓婃灦褰掕繕鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-snowflake"></i>
+ <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-transfer"></i>
+ <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-light"></i>
+ <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-senior"></i>
+ <cite>鏉ユ枡妫�楠屽崟</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-cellphone"></i>
+ <cite>鐢熶骇鎷嗙鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-dollar"></i>
+ <cite>鐢熶骇姹囨姤鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-survey"></i>
+ <cite>鐢熶骇閫�鏂欏崟</cite>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md12">
+ <!-- 鏁版嵁姒傝 -->
+ <div class="layui-card">
+ <div class="layui-card-header">鏁版嵁姒傝</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-dataview" data-anim="fade" lay-filter="LAY-index-dataview" lay-anim="fade" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <div carousel-item="" id="LAY-index-dataview">
+ <div class="" _echarts_instance_="1621151534573" style="-webkit-tap-highlight-color: transparent; user-select: none; background-color: rgba(0, 0, 0, 0);">
+ <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
+ <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
+ <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
+ <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
+ <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
+ </div>
+ </div>
+ </div>
+ <div class="layui-carousel-ind"><ul><li class=""></li><!--<li class="layui-this"></li><li class=""></li>--></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md4">
+ <!-- 寰呭姙浜嬮」 -->
+ <div class="layui-card">
+ <div class="layui-card-header">寰呭姙浜嬮」</div>
+ <div class="layui-card-body">
+ <div class="layui-carousel layadmin-carousel layadmin-backlog" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+ <div carousel-item="">
+ <ul class="layui-row layui-col-space10 layui-this">
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a lay-href="app/content/comment.html" class="layadmin-backlog-body">-->
+ <h3>寰呭鍗曟嵁</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a lay-href="app/forum/list.html" class="layadmin-backlog-body">-->
+ <h3>寰呭璧勬枡</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a lay-href="template/goodslist.html" class="layadmin-backlog-body">-->
+ <h3>寰呮煡鐪嬫秷鎭�</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ <li class="layui-col-xs6">
+ <a href="javascript:void(0);">
+ <!--<a href="javascript:;" onclick="layer.tips('涓嶈烦杞�', this, {tips: 3});" class="layadmin-backlog-body">-->
+ <h3>寰呭洖澶嶆秷鎭�</h3>
+ <p><cite>0</cite></p>
+ </a>
+ </li>
+ </ul>
+ <ul class="layui-row layui-col-space10">
+ <li class="layui-col-xs6">
+ <a href="javascript:;" class="layadmin-backlog-body">
+ <h3>鏈槄淇℃伅</h3>
+ <p><cite style="color: #FF5722;">0</cite></p>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+ </div>
+ </div>
+ </div>
+
+ <!--绯荤粺鍏憡-->
+ <div class="main_left1_main_top">
+ <div class="main_left1_main_top_right">
+ <span>
+ <a href="绯荤粺绠＄悊/鍏憡/GG_NoticeBillList.html" style="color: #9a9a9a;"></a>
+ </span>
+ </div>
+ </div>
+ <div class="main_left1_mainx">
+ <div class="main_left1_mainx_right" style="width: 98%; float: none; padding-left: 11px;">
+ <ul class="ullist">
+ </ul>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.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>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="./js/index.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'console'], function () {
+ //鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , tr = layui.tr
+ , td = layui.td
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ var element = layui.element;
+ var $ = layui.jquery;
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�", "鎺ユ敹浜�"];
+
+ //鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
+ var HType = "PC";
+
+ // 宸插彂甯冪殑鍏憡淇℃伅
+ let noticeInfoList;
+ //椤甸潰鍒濆鍖�
+ set_ClearBill();
+
+ //椤甸潰鍒濆鍖栨柟娉�
+ function set_ClearBill() {
+
+ get_Display();
+ get_Notices();
+ }
+
+ //椤甸潰鍏跺畠鏂规硶
+ function get_Display() {
+ //鑾峰彇鑿滃崟鍒楄〃鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + "/Web/Xt_UserFastMenu_Init",
+ type: "GET",
+ async: false,
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
+ success: function (data) {
+ console.log(data.data);
+ FastMenu(data.data);
+ },
+ error: function (data) {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ function FastMenu(data) {
+ var liStr = '';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0) {
+ liStr += '<ul class="layui-row layui-col-space10 layui-this">';
+ } else if (i % 8 == 0) {
+ liStr += '<ul class="layui-row layui-col-space10">';
+ }
+
+ liStr += '<li class="layui-col-xs3">';
+
+ if (data[i]["HPicNum"] == null || data[i]["HPicNum"] == "") {
+ liStr += '<i id="' + data[i]["HSubFuncID"] + '" class="layui-icon layui-icon-add-circle"></i>';
+ } else {
+ liStr += '<i id="' + data[i]["HSubFuncID"] + '" class="' + data[i]["HPicNum"] + '"></i>';
+ }
+
+ liStr += '<a lay-href="' + data[i]["Hurl"] + '">';
+
+ liStr += '<cite>' + data[i]["HCaption"] + '</cite>';
+
+ liStr += '</a>';
+
+ liStr += '</li>';
+
+ if (i % 8 == 7) {
+ liStr += '</ul>';
+ }
+ };
+ if (data.length % 8 == 0) {
+ liStr += '<ul class="layui-row layui-col-space10">';
+ liStr += '<li class="layui-col-xs3">';
+ liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
+ liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
+ liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
+ liStr += '</a>';
+ liStr += '</li>';
+ liStr += '</ul>';
+ } else {
+ liStr += '<li class="layui-col-xs3">';
+ liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
+ liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
+ liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
+ liStr += '</a>';
+ liStr += '</li>';
+ liStr += '</ul>';
+ }
+ $(".FastMenu").html(liStr);
+ element.init();
+
+ for (var i = 0; i < data.length; i++) {
+ var item = document.getElementById(data[i]["HSubFuncID"]);
+ item.addEventListener("click", function (event) {
+ //alert("hh");
+ //鎵撳紑鍥炬爣璁剧疆瀛愮獥鍙�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "蹇嵎鏂瑰紡-鍥炬爣璁剧疆" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["30%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: '../绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu_IconSet.html?HItemID=' + event.srcElement.id
+ , btn: ["纭畾"]
+ , btn1: function (index, laero) {
+ //鍒锋柊蹇嵎鏂瑰紡
+ get_Display();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }, false);
+ }
+ }
+
+ //鐢熸垚閫氱煡鍒楄〃
+ function get_Notices() {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load()
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ let list = document.getElementById("ullist");
+ $.ajax({
+ // 璇锋眰鏂瑰紡涓篏ET
+ type: 'GET',
+ // 鏁版嵁鎺ュ彛锛氳姹侸SON鏁版嵁鍒板悗绔�
+ url: GetWEBURL() + '/GG_Notice/notices',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"] },
+ // 寮�鍚悓姝�
+ async: false,
+ success: function (res) {
+ // 鑻ヨ繑鍥炵殑鐘舵�佺爜涓�0锛屽垯鎵ц鎴愬姛澶勭悊鎿嶄綔
+ if (res.count == 1) {
+ // 鑾峰彇鍏憡鏁版嵁
+ noticeInfoList = res.data;
+ for (var i = 0; i < noticeInfoList.length; i++) {
+ var liObj = document.createElement("li");
+ liObj.innerHTML = "<span>" + layui.util.toDateString(noticeInfoList[i].鏃ユ湡, 'MM-dd') + "</span>";
+ /* + " < a href = \"viewpage.html\" >" + noticeInfoList[i].涓婚 + "</a >";*/
+ list.appendChild(liObj);
+ }
+ } else {
+ layer.msg('鑾峰彇澶辫触', { icon: 2 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ });
+ </script>
+</body>
+
+
+</html>
\ No newline at end of file
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 9d9d2b6..4fa5b0e 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>LMES绠＄悊绯荤粺</title>
+ <title id="HCusName"></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">
@@ -109,7 +109,7 @@
<div class="layui-side-scroll">
<div class="layui-logo" lay-href="home/console.html">
<img src="../layuiadmin/myicon/win.svg" alt="PC绔�" style="width:25px;height:25px;margin-right: 5px;" />
- <span>LMES绠＄悊绯荤粺</span>
+ <span id="HMenuLabel"></span>
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
<!-- 閲囪喘绠＄悊 -->
@@ -195,10 +195,8 @@
set_sideMenuDisPlay();
//#endregion
-
- //#region
-
- //#endregion
+ //鑿滃崟鏍忓懡鍚�
+ setMenuLabel();
//#region 椤甸潰鍏跺畠鏂规硶
//鏄剧ず渚ц竟鑿滃崟
@@ -306,6 +304,13 @@
//#endregion
});
+ //鑿滃崟鏍忓懡鍚�
+ function setMenuLabel() {
+ console.log(sessionStorage["HMenuLabel"]);
+ $("#HMenuLabel").html(sessionStorage["HMenuLabel"]);
+ $("#HCusName").text(sessionStorage["HCusName"]);
+ };
+
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
</script>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index d668963..534abdf 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -29,7 +29,7 @@
<div class="ax-tab" axTab>
<ul class="ax-row ax-tab-nav ax-menu-tab">
- <a href="###" class="ax-item ax-col" style="font-size: 20px;">鏅轰簯杩堟�滾-MES</a>
+ <a href="###" class="ax-item ax-col" style="font-size: 20px;" id="HLogoLabel">鏅轰簯杩堟�滾-MES</a>
<!--<a href="###" class="ax-item">娉ㄥ唽鏂扮敤鎴�</a>-->
<!--<li class="ax-col"></li>-->
</ul>
@@ -266,6 +266,10 @@
});
}
})
+
+ //鑾峰彇鍩虹淇℃伅
+ getBaseInfo();
+
//鑾峰彇鐧诲綍椤电粍缁囧垪
var Organization = '';
$.ajax({
@@ -290,9 +294,6 @@
layer.closeAll("loading");
}
})
-
-
-
//form.render();
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
@@ -320,7 +321,6 @@
$("#LAY-user-login-password").focus();
}
})
-
//璇诲彇閰嶇疆鏂囦欢
function get_ReadConfigFile() {
@@ -352,7 +352,6 @@
//playSound();
layer.msg("璇烽�夋嫨缁勭粐锛�");
return;
-
}
var UserName = $("#LAY-user-login-username").val();
var PassWord = $("#LAY-user-login-password").val();
@@ -433,6 +432,25 @@
audio.play();
}
+ //鑾峰彇鍩虹淇℃伅
+ function getBaseInfo() {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/BaseInfo",
+ data: {},
+ success: function (res) {
+ //鏌ヨ鎴愬姛
+ if (res.count == 1) {
+ var data = res.data[0];
+ console.log(data);
+ sessionStorage["HCusName"] = data.HCusName;
+ sessionStorage["HLogoLabel"] = data.HLogoLabel;
+ sessionStorage["HMenuLabel"] = data.HMenuLabel;
+ $("#HLogoLabel").text(data.HLogoLabel);
+ }
+ }
+ })
+ }
});
</script>
</body>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
index 6038b77..c5e98fe 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\344\275\234\350\201\224\347\263\273\345\215\225/OA_Add_Edit_WorkLinkBill.html"
@@ -381,14 +381,16 @@
else if (OperationType == 2) {
//婧愬崟鏂板
var datajson;
- var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
- var arr = str.substring(str.lastIndexOf("=") + 1);
- datajson = $.parseJSON(decodeURI(arr));
+ //鑾峰彇url鍙傛暟
+ var params = new URLSearchParams(location.search);;
+ console.log(params.get('dataJson'));
+ datajson = params.get('dataJson');
+ datajson = JSON.parse(decodeURIComponent(datajson));
+
$("#HRelationInterID").val(datajson.HRelationInterID);
$("#HRelationEntryID").val(datajson.HRelationEntryID);
$("#HRelationBillNo").val(datajson.HRelationBillNo);
$("#HRelationBillType").val(datajson.HRelationBillType);
-
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -705,7 +707,6 @@
end: function () {
},
success: function (layero, index) {
-
}
});
});
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 6e7c4c8..414745a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -349,7 +349,7 @@
//#endregion
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
+ var titleData = ["hmainid","HEntryID","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
"HFeedback", "HPriority", "HUserID","甯佸埆浠ｇ爜","閲囪喘鏂瑰紡浠ｇ爜","缁撶畻鏂瑰紡浠ｇ爜","閮ㄩ棬浠ｇ爜","涓荤浠ｇ爜","涓氬姟鍛樹唬鐮�","璁￠噺鍗曚綅浠ｇ爜"];
//#endregion
@@ -363,7 +363,6 @@
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0;
-
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -384,6 +383,9 @@
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
+ break;
+ //閫氱煡鎸夐挳
+ case 'btn-Notice': set_NoticeBill();
break;
//娴忚
case 'btn-view': get_ViewReport();
@@ -784,6 +786,7 @@
//}
}
+
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -873,6 +876,7 @@
}
});
}
+
//鏂板
function set_AddNew() {
layer.open({
@@ -893,6 +897,7 @@
}
});
}
+
//缂栬緫鍗曟嵁
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -921,6 +926,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+
//鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -964,6 +970,30 @@
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //閫氱煡
+ function set_NoticeBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var dataJson = {
+ HRelationInterID: data[0].hmainid,
+ HRelationEntryID: data[0].hsubid,
+ HRelationBillNo: data[0].鍗曟嵁鍙�,
+ HRelationBillType: data[0].HBillType
+ }
+ console.log(JSON.parse(decodeURIComponent(encodeURIComponent(JSON.stringify(dataJson)))));
+ if (data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/宸ヤ綔鑱旂郴鍗�/OA_Add_Edit_WorkLinkBill.html?OperationType=2&linterid=&dataJson=' + encodeURIComponent(JSON.stringify(dataJson))
+ , resize: false
+ })
}
}
@@ -1141,7 +1171,6 @@
}
//#endregion
-
//#region 澶氳涓嬫帹锛堝簲浠樺崟锛�
function set_PushPayableBills() {
var checkStatus = table.checkStatus('mainTable')
@@ -1204,7 +1233,6 @@
}
}
//#endregion
-
//#region 澶氳涓嬫帹锛堥��鏂欓�氱煡鍗曪級
function set_PushPOInStockBackBills() {
@@ -1561,7 +1589,6 @@
}
//#endregion
-
//鑾峰彇鍒楀
function getColumnsWidth() {
var result = [];
@@ -1590,6 +1617,7 @@
return result;
}
+
//淇濆瓨鍒楀
function set_SaveGridColWidth() {
var arr = [];
@@ -1631,6 +1659,7 @@
}
get_FastQuery(table, option);
}
+
//榛樿鍒楀
function set_DefaultGridColWidth() {
var arr = [];
--
Gitblit v1.9.1