From 400501d13630b5135a7605c3103b8962b443d6aa Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 6 Feb 2024 16:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E4=BF=AE=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/overhaulOrder.js      | 26 +++++++++-----------------
 components/form/index.vue |  2 +-
 pages.json                | 16 +++++++++++++++-
 plugins/time.js           |  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/api/overhaulOrder.js b/api/overhaulOrder.js
index 5374490..344dbd1 100644
--- a/api/overhaulOrder.js
+++ b/api/overhaulOrder.js
@@ -28,48 +28,40 @@ export function overhaulOrderPage(params) {
 // 操作工单
 export function orderClick(params) {
 	return request({
-		url: '/eam/device-maintenance-main/orderClick',
+		url: '/eam/device-inspection-main/onClick',
 		'method': 'GET',
 		params
 	})
 }
 // 添加维修工单子项维修内容
-export function repairOrderDetailCreate(data) {
+export function overhaulOrderDetailCreate(data) {
 	return request({
-		url: '/eam/device-maintenance-detail/create',
+		url: '/eam/device-inspection-detail/create',
 		'method': 'POST',
 		data
 	})
 }
 // 编辑维修工单子项维修内容
-export function repairOrderDetailUpdate(data) {
+export function overhaulOrderDetailUpdate(data) {
 	return request({
-		url: '/eam/device-maintenance-detail/update',
+		url: '/eam/device-inspection-detail/update',
 		'method': 'PUT',
 		data
 	})
 }
 // 获得维修工单子列表
-export function repairOrderDetailList(params) {
+export function overhaulOrderDetailList(params) {
 	return request({
-		url: '/eam/device-maintenance-detail/selectListByNumber',
+		url: '/eam/device-inspection-detail/selectListByNumber',
 		'method': 'GET',
 		params
 	})
 }
 // 删除维修工单子
-export function repairOrderDetailDelete(id) {
+export function overhaulOrderDetailDelete(id) {
 	return request({
-		url: '/eam/device-maintenance-detail/delete?id='+id,
+		url: '/eam/device-inspection-detail/delete?id='+id,
 		'method': 'DELETE'
 	})
 }
 
-//转办
-export function transfer(params) {
-	return request({
-		url: '/eam/device-maintenance-main/turnTo',
-		'method': 'GET',
-		params
-	})
-}
\ No newline at end of file
diff --git a/components/form/index.vue b/components/form/index.vue
index e83165f..4920a8e 100644
--- a/components/form/index.vue
+++ b/components/form/index.vue
@@ -369,7 +369,7 @@
 					array2.push(e.hour)
 				}
 				if(this.formatValue.indexOf('mm')>-1){
-					array2.push(e.month)
+					array2.push(e.minute)
 				}
 				if(this.formatValue.indexOf('ss')>-1){
 					array2.push(e.second)
diff --git a/pages.json b/pages.json
index 72a8b3b..bff2335 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,7 @@
 	},{
 		"path": "pages/repairOrder/addServiceRecord",
 		"style": {
-			"navigationBarTitleText": "添加维修记录",
+			"navigationBarTitleText": "添加维修内容",
 			"navigationBarBackgroundColor": "#409eff",
 			"navigationBarTextStyle": "white"
 		}
@@ -115,6 +115,20 @@
 			"navigationBarBackgroundColor": "#409eff",
 			"navigationBarTextStyle": "white"
 		}
+	},{
+		"path": "pages/overhaulOrder/addServiceRecord",
+		"style": {
+			"navigationBarTitleText": "添加检修内容",
+			"navigationBarBackgroundColor": "#409eff",
+			"navigationBarTextStyle": "white"
+		}
+	},{
+		"path": "pages/overhaulOrder/transfer",
+		"style": {
+			"navigationBarTitleText": "转办",
+			"navigationBarBackgroundColor": "#409eff",
+			"navigationBarTextStyle": "white"
+		}
 	},{
 		"path": "pages/mine/changePassword",
 		"style": {
diff --git a/plugins/time.js b/plugins/time.js
index 2e7dfa2..9f8a11c 100644
--- a/plugins/time.js
+++ b/plugins/time.js
@@ -2,7 +2,7 @@ export default {
   formatDate(timestamp){
 	  // 获取当前时间戳（单位：毫秒）
 	  // var timestamp = Date.now(); // 或者传入特定的时间戳值
-	   
+	   timestamp = timestamp ? timestamp :Date.now()
 	  // 创建Date对象并设置时间戳
 	  var dateObj = new Date(timestamp);