From bbeea3379807b3c7e03f99621aae5c1e2367f69b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 19 六月 2023 14:47:26 +0800
Subject: [PATCH] apk2
---
igds-app/js/admin/work-apply.js | 10 ++-
igds-app/js/admin/work-record.js | 71 ++++++-----------------
igds-app/unpackage/release/apk/H580320F9__20230619143120.apk | 0
igds-app/js/admin/work-audit.js | 71 ++++++-----------------
4 files changed, 44 insertions(+), 108 deletions(-)
diff --git a/igds-app/js/admin/work-apply.js b/igds-app/js/admin/work-apply.js
index a4e1df8..20daf74 100644
--- a/igds-app/js/admin/work-apply.js
+++ b/igds-app/js/admin/work-apply.js
@@ -66,7 +66,7 @@
//鑾峰彇涓氬姟绫诲瀷
var data1 = {
- "interfaceId": "6101",
+ "interfaceId": "5705",
"outId": "11101",
"reqDateTime": new Date(),
"tokenAuth": "",
@@ -88,6 +88,8 @@
typeList();
}
+
+
//寮�濮嬫椂闂�
function chooseDate() {
var dtpicker = new mui.DtPicker({
@@ -207,8 +209,8 @@
var fenl = {}
$.each(data, function(index, item) {
fenl = {
- value: item.name,
- text: item.id,
+ value: item.typeName,
+ text: item.typeId,
}
listPicker1.push(fenl)
})
@@ -271,7 +273,7 @@
var _getParam = function(obj, param) {
return obj[param] || '';
};
- //鏅�氱ず渚�
+ //涓氬姟绫诲瀷
var showUserPickerButton = doc.getElementById('ywlx');
showUserPickerButton.addEventListener('tap', function(event) {
var userResult = doc.getElementById('ywlx-val');
diff --git a/igds-app/js/admin/work-audit.js b/igds-app/js/admin/work-audit.js
index 81f8226..fa16475 100644
--- a/igds-app/js/admin/work-audit.js
+++ b/igds-app/js/admin/work-audit.js
@@ -1,6 +1,7 @@
var url = null;
var auditList = null;
var workAuditData = null;
+var dateTime;
//宸ュ崟瀹℃牳鍒楄〃
var data = {
"interfaceId": "5703",
@@ -30,10 +31,25 @@
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
-
+ dateTime = getDate(new Date());
getAuditList();
}
-
+//鏃ユ湡鏍煎紡鍖杫yyy-MM-dd
+function getDate(date) {
+ var year = date.getFullYear();
+ var month, day,hour,minute;
+ month = date.getMonth() + 1;
+ if (month > 0 && month <= 9) {
+ month = "0" + month;
+ }
+ day = date.getDate()
+ if (day > 0 && day <= 9) {
+ day = "0" + day
+ }
+ hour = date.getHours();
+ minute = date.getMinutes();
+ return year + "-" + month + "-" + day + " "+ hour + ":" + minute
+}
//鑾峰彇宸ュ崟瀹℃牳鍒楄〃
function getAuditList() {
console.log(JSON.stringify(data.data),"work-aduit","宸ュ崟瀹℃牳鍒楄〃")
@@ -59,55 +75,6 @@
}
})
- // auditList = [{
- // "id": "59",
- // "deptName": "1鍙蜂粨",
- // "applyUser": "in anim exercitation",
- // "applyUserName": "閮濆啗",
- // "type": "exercitation reprehenderit sint",
- // "startTime": "1974-07-05 21:56",
- // "endTime": "2013-08-19 05:43",
- // "info": "sed adipisicing quis irure",
- // "depotId": "90",
- // "depotName": "鍗充紶鐘舵柊浜旈檯"
- // },
- // {
- // "id": "39",
- // "deptName": "1鍙蜂粨",
- // "applyUser": "dolor laboris",
- // "applyUserName": "琚佸己",
- // "type": "sed et sit irure eu",
- // "startTime": "2015-10-25 12:30",
- // "endTime": "1971-04-18 19:34",
- // "info": "reprehenderit qui quis pariatur anim",
- // "depotId": "89",
- // "depotName": "褰撳叆鐗╄繕绠�"
- // },
- // {
- // "id": "55",
- // "deptName": "3鍙蜂粨",
- // "applyUser": "quis",
- // "applyUserName": "瀹嬩附",
- // "type": "in",
- // "startTime": "1994-10-12 18:25",
- // "endTime": "2008-01-19 00:26",
- // "info": "ex ullamco id dolor",
- // "depotId": "42",
- // "depotName": "鏂板父鎶�浣嶄腑"
- // },
- // {
- // "id": "50",
- // "deptName": "2鍙蜂粨",
- // "applyUser": "dolor",
- // "applyUserName": "榛勮秴",
- // "type": "nostrud elit",
- // "startTime": "2018-07-07 10:25",
- // "endTime": "2000-11-07 10:02",
- // "info": "et minim",
- // "depotId": "53",
- // "depotName": "浜虹瀹冨啗棰�"
- // }
- // ]
}
function renderAuditList() {
@@ -136,7 +103,7 @@
html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">--</div></a></li>';
html += '<li><a href="" class="con" style="background-image: url(images/icons/a-bg13.png);">';
html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">--</div></a></li></ul>';
- html += '<div class="time">鏈夋晥鏈�: 2023-01-01 鑷� 2023-01-01 </div>';
+ html += '<div class="time">鏈夋晥鏈�: ' + dateTime + ' 鑷� ' + dateTime + ' </div>';
html += '</div></div></div></li>';
// html +=
diff --git a/igds-app/js/admin/work-record.js b/igds-app/js/admin/work-record.js
index 958753a..caae15f 100644
--- a/igds-app/js/admin/work-record.js
+++ b/igds-app/js/admin/work-record.js
@@ -1,5 +1,6 @@
var url = null;
var recordList = null;
+var dateTime;
//鐢宠璁板綍
var data = {
"interfaceId": "5702",
@@ -17,7 +18,24 @@
data.tokenAuth = user.tokenAuth;
data.data.userName = user.username;
console.log(JSON.stringify(data.data),"work-record")
+ dateTime = getDate(new Date());
getRecordList();
+}
+//鏃ユ湡鏍煎紡鍖杫yyy-MM-dd HH:mm
+function getDate(date) {
+ var year = date.getFullYear();
+ var month, day,hour,minute;
+ month = date.getMonth() + 1;
+ if (month > 0 && month <= 9) {
+ month = "0" + month;
+ }
+ day = date.getDate()
+ if (day > 0 && day <= 9) {
+ day = "0" + day
+ }
+ hour = date.getHours();
+ minute = date.getMinutes();
+ return year + "-" + month + "-" + day + " "+ hour + ":" + minute
}
//鑾峰彇鐢宠璁板綍鍒楄〃
@@ -43,57 +61,6 @@
mui.alert('绯荤粺绻佸繖,璇烽噸鏂扮櫥褰曞皾璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
}
})
- // recordList = [{
- // "id": "59",
- // "deptName": "1鍙蜂粨",
- // "status": "10",
- // "applyUserName": "閮濆啗",
- // "type": "exercitation reprehenderit sint",
- // "startTime": "1974-07-05 21:56",
- // "endTime": "2013-08-19 05:43",
- // "info": "sed adipisicing quis irure",
- // "depotId": "90",
- // "depotName": "鍗充紶鐘舵柊浜旈檯"
- // },
- // {
- // "id": "39",
- // "deptName": "1鍙蜂粨",
- // "status": "20",
- // "applyUserName": "琚佸己",
- // "type": "sed et sit irure eu",
- // "startTime": "2015-10-25 12:30",
- // "endTime": "1971-04-18 19:34",
- // "info": "reprehenderit qui quis pariatur anim",
- // "depotId": "89",
- // "depotName": "褰撳叆鐗╄繕绠�"
- // },
- // {
- // "id": "55",
- // "deptName": "3鍙蜂粨",
- // "status": "20",
- // "applyUserName": "瀹嬩附",
- // "type": "in",
- // "startTime": "1994-10-12 18:25",
- // "endTime": "2008-01-19 00:26",
- // "info": "ex ullamco id dolor",
- // "depotId": "42",
- // "depotName": "鏂板父鎶�浣嶄腑"
- // },
- // {
- // "id": "50",
- // "deptName": "2鍙蜂粨",
- // "status": "10",
- // "applyUserName": "榛勮秴",
- // "type": "nostrud elit",
- // "startTime": "2018-07-07 10:25",
- // "endTime": "2000-11-07 10:02",
- // "info": "et minim",
- // "depotId": "53",
- // "depotName": "浜虹瀹冨啗棰�"
- // }
- // ]
-
-
}
function renderRecordList() {
@@ -124,7 +91,7 @@
html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">--</div></a></li>';
html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg13.png);">';
html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">--</div></a></li></ul>';
- html += '<div class="time"><p>鏈夋晥寮�濮嬫椂闂�: <span>2023-01-01</span></p><p>鏈夋晥缁撴潫鏃堕棿: <span>2023-01-01</span></p></div>';
+ html += '<div class="time"><p>鏈夋晥寮�濮嬫椂闂�: <span>' + dateTime + '</span></p><p>鏈夋晥缁撴潫鏃堕棿: <span>' + dateTime + '</span></p></div>';
// html +=
// '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤鐢宠璁板綍淇℃伅</div></div></li>';
}
diff --git a/igds-app/unpackage/release/apk/H580320F9__20230619143120.apk b/igds-app/unpackage/release/apk/H580320F9__20230619143120.apk
new file mode 100644
index 0000000..f6dd97a
--- /dev/null
+++ b/igds-app/unpackage/release/apk/H580320F9__20230619143120.apk
Binary files differ
--
Gitblit v1.9.3