From df0e57a3e2fd76a25545b05cae9380badd454934 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期二, 03 九月 2024 16:51:08 +0800
Subject: [PATCH] 111
---
WebTM/WebTM.csproj.user | 2 +-
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 45 +++++++++++++++++++++++++++++++++++++++------
WebTM/views/home/console111.html | 5 +++--
3 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..6cd52dd 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/home/console111.html b/WebTM/views/home/console111.html
index ee6e0f3..f0816c8 100644
--- a/WebTM/views/home/console111.html
+++ b/WebTM/views/home/console111.html
@@ -28,6 +28,7 @@
.layui-table-box {
height: 400px;
}
+
.welcome .layui-card {
border: 1px solid #f2f2f2;
border-radius: 5px;
@@ -71,7 +72,7 @@
<script>
/^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
</script>
-
+ <script src="./js/index.js"></script>
</head>
<body layadmin-themealias="default">
<div class="layui-fluid">
@@ -303,7 +304,6 @@
<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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -462,6 +462,7 @@
var liObj = document.createElement("li");
liObj.innerHTML = "<span>" + layui.util.toDateString(noticeInfoList[i].鏃ユ湡, 'MM-dd') + "</span>";
/* + " < a href = \"viewpage.html\" >" + noticeInfoList[i].涓婚 + "</a >";*/
+ console.log(liObj);
list.appendChild(liObj);
}
} else {
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_POOrderBillEdit.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_POOrderBillEdit.html"
index 5484d63..bf8bc15 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_POOrderBillEdit.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_POOrderBillEdit.html"
@@ -934,6 +934,27 @@
}
//#endregion
+ //#region 鍏蜂綋鏃堕棿杞崲
+ function formatSpecificDate(date) {
+ var d = new Date(date), //瀹氫箟涓�涓皢date鍊艰浆鎹负鏃堕棿绫诲瀷璧嬪�肩粰d 鍒涘缓涓�涓柊鐨凞ate瀵硅薄d锛屼娇鐢ㄤ紶鍏ョ殑date鍙傛暟锛堝瓧绗︿覆鎴栨椂闂存埑锛変綔涓烘瀯閫犲嚱鏁扮殑鍙傛暟
+ month = '' + (d.getMonth() + 1), //浠巇瀵硅薄涓幏鍙栨湀浠�,灏嗚繖涓湀浠芥暟瀛楄浆鎹㈡垚瀛楃涓�
+ day = '' + d.getDate(), //浠巇瀵硅薄涓幏鍙�,灏嗚繖涓棩瀛楄浆鎹㈡垚瀛楃涓�
+ year = d.getFullYear(),
+ hour = '' + d.getHours(),
+ minutes = '' + d.getMinutes(),
+ secondes = '' + d.getSeconds(); // 浠巇瀵硅薄涓幏鍙栧畬鏁寸殑骞翠唤
+
+ if (month.length < 2) month = '0' + month; //鍒ゆ柇鏈堜唤鐨勯暱搴︽槸鍚﹀皬浜�2浣嶆暟 灏忎簬杩欏湪鍓嶅姞涓�0
+ if (day.length < 2) day = '0' + day; //鍒ゆ柇澶╂暟闀垮害鏄惁灏忎簬2浣嶆暟 灏忎簬杩欏湪鍓嶅姞涓�0
+ if (hour.length < 2) hour = '0' + hour;
+ if (minutes.length < 2) minutes = '0' + minutes;
+ if (secondes.length < 2) secondes = '0' + secondes;
+ var specific = hour + ':' + minutes + ':' + secondes;
+ var time = [year, month, day].join('-');
+ return [time, specific].join(' '); //灏嗗勾浠姐�佹湀浠藉拰鏃ュ瓧绗︿覆鏀惧叆涓�涓暟缁勪腑锛屽苟浣跨敤join鏂规硶灏嗗畠浠繛鎺ユ垚涓�涓瓧绗︿覆
+ }
+ //#endregion
+
//#region 鎵撳嵃
function get_PrintReport() {
if (linterid == null || linterid == "") {
@@ -1039,11 +1060,11 @@
, "HMaker": data[0].鍒跺崟浜� // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
, "HChecker": data[0].瀹℃牳浜� // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
, "HCloseMan": data[0].鍏抽棴浜� // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
- , "HMakeDate": data[0].鍒跺崟鏃ユ湡 // 璁剧疆鈥滃埗鍗曟棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HCheckDate": data[0].瀹℃牳鏃ユ湡 // 璁剧疆鈥滃鏍告棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HCloseDate": data[0].鍏抽棴鏃ユ湡 // 璁剧疆鈥滃叧闂棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HUpDateDate": data[0].淇敼鏃ユ湡 // 璁剧疆鈥滀慨鏀规棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HDeleteDate": data[0].浣滃簾鏃ユ湡 // 璁剧疆鈥滀綔搴熸棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HMakeDate": formatSpecificDate(data[0].鍒跺崟鏃ユ湡) // 璁剧疆鈥滃埗鍗曟棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HCheckDate": formatSpecificDate(data[0].瀹℃牳鏃ユ湡) // 璁剧疆鈥滃鏍告棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HCloseDate": formatSpecificDate(data[0].鍏抽棴鏃ユ湡) // 璁剧疆鈥滃叧闂棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HUpDateDate": formatSpecificDate(data[0].淇敼鏃ユ湡) // 璁剧疆鈥滀慨鏀规棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HDeleteDate": formatSpecificDate(data[0].浣滃簾鏃ユ湡) // 璁剧疆鈥滀綔搴熸棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -2063,7 +2084,19 @@
$("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
}
-
+ //鏃堕棿鏍煎紡
+ function formatDateTime(date) {
+ const year = date.getFullYear();
+ const month = date.getMonth() + 1;
+ const day = date.getDate();
+ const hour = date.getHours();
+ const minute = date.getMinutes();
+ const second = date.getSeconds();
+ return `${year}-${pad(month)}-${pad(day)} ${pad(hour)}:${pad(minute)}:${pad(
+ second
+ )}`;
+ }
+
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
$("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
--
Gitblit v1.9.1