From daa51f500b9305e3f47272359f05b84620cde445 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 21 Mar 2024 19:21:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=AE=8C=E6=88=90=E6=97=B6=E5=80=99=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deviceReport/addForm.vue                   | 2 +-
 src/pages/overhaulOrder/addForm.vue                  | 2 +-
 src/pages/repairOrder/addForm.vue                    | 2 +-
 src/pages/repairOrder/transfer.vue                   | 2 +-
 src/pages/sparePartsServiceWorkOrderList/addForm.vue | 2 +-
 src/pages/spotCheckOrder/addForm.vue                 | 7 +++++--
 src/pages/upkeepOrder/addServiceRecord.vue           | 8 ++++++--
 src/pages/upkeepOrder/detail.vue                     | 2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/pages/deviceReport/addForm.vue b/src/pages/deviceReport/addForm.vue
index ba43d10..00e6f81 100644
--- a/src/pages/deviceReport/addForm.vue
+++ b/src/pages/deviceReport/addForm.vue
@@ -18,7 +18,7 @@
 			</u-form-item>
 			<u-form-item :label="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required>
 				<u-input v-model="form.deviceNumber" :placeholder="`请输入${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`"
-					@blur="blur()" />
+					@blur="blur()" @confirm='blur()'/>
 				<view class="right-button" @click="chickRightButton">
 					扫描
 				</view>
diff --git a/src/pages/overhaulOrder/addForm.vue b/src/pages/overhaulOrder/addForm.vue
index c2ea802..6b314e1 100644
--- a/src/pages/overhaulOrder/addForm.vue
+++ b/src/pages/overhaulOrder/addForm.vue
@@ -33,7 +33,7 @@
 			<u-form-item :label="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required
 				:class="isDisabled?'disabled':''">
 				<u-input v-model="form.deviceNumber" :placeholder="`请输入${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`"
-					@blur="blur()" />
+					@blur="blur()"  @confirm='blur()'/>
 				<view class="right-button" @click="chickRightButton" v-show="!isDisabled">
 					扫描
 				</view>
diff --git a/src/pages/repairOrder/addForm.vue b/src/pages/repairOrder/addForm.vue
index 1127cff..d70c758 100644
--- a/src/pages/repairOrder/addForm.vue
+++ b/src/pages/repairOrder/addForm.vue
@@ -29,7 +29,7 @@
 			</u-form-item> -->
 			<u-form-item :label="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required>
 				<u-input v-model="form.deviceNumber" :placeholder="`请输入${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`"
-					@blur="blur()" />
+					@blur="blur()"  @confirm='blur()'/>
 				<view class="right-button" @click="chickRightButton">
 					扫描
 				</view>
diff --git a/src/pages/repairOrder/transfer.vue b/src/pages/repairOrder/transfer.vue
index 505b847..c032d3a 100644
--- a/src/pages/repairOrder/transfer.vue
+++ b/src/pages/repairOrder/transfer.vue
@@ -39,7 +39,7 @@
 			<u-form-item :label="`${form.receiverType=='DEVICE'||form.receiverType == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required
 				v-if="form.status==0">
 				<u-input v-model="form.deviceNumber" :placeholder="`请输入${form.receiverType=='DEVICE'||form.receiverType == 'TECH'?'设备' : '模具'}编码`"
-					@blur="blur()" />
+					@blur="blur()"  @confirm='blur()'/>
 				<view class="right-button" @click="chickRightButton">
 					扫描
 				</view>
diff --git a/src/pages/sparePartsServiceWorkOrderList/addForm.vue b/src/pages/sparePartsServiceWorkOrderList/addForm.vue
index 22f7578..22c8a2d 100644
--- a/src/pages/sparePartsServiceWorkOrderList/addForm.vue
+++ b/src/pages/sparePartsServiceWorkOrderList/addForm.vue
@@ -71,7 +71,7 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="库位" prop="locationNumber" required v-if="isShow">
-						<u-input v-model="form1.locationNumber" placeholder="请选择库位" @blur="blur()" />
+						<u-input v-model="form1.locationNumber" placeholder="请选择库位" @blur="blur()"  @confirm='blur()'/>
 						<view class="right-button" @click="chickRightButton">
 							扫描
 						</view>
diff --git a/src/pages/spotCheckOrder/addForm.vue b/src/pages/spotCheckOrder/addForm.vue
index e396626..0e872e5 100644
--- a/src/pages/spotCheckOrder/addForm.vue
+++ b/src/pages/spotCheckOrder/addForm.vue
@@ -7,7 +7,7 @@
 			</u-form-item>
 			<u-form-item :label="`${type=='DEVICE'?'设备' : '模具'}编码`" prop="deviceNumber" required>
 				<u-input v-model="form.deviceNumber"
-					:placeholder="`请输入${type=='DEVICE'?'设备' : '模具'}编码`" @blur="blur"/>
+					:placeholder="`请输入${type=='DEVICE'?'设备' : '模具'}编码`" @blur="blur" @confirm='blur()'/>
 				<view class="right-button" @click="chickRightButton">
 					扫描
 				</view>
@@ -50,7 +50,7 @@
 								<view>{{item.equipmentParts}}</view>
 							</view>
 							<view class="dec">
-									<view style="margin-right: 20rpx;">是否符合:</view><u-switch v-model="item.isConform"></u-switch>
+									<view style="margin-right: 20rpx;">是否符合:</view><u-switch v-model="item.isConform1"></u-switch>
 							
 							</view>
 						</u-col>
@@ -166,6 +166,9 @@
 			proxy.$modal.showToast('该设备无检修项目')
 			return;
 		}
+		subList.value.forEach(item=>{
+			item.isConform = !item.isConform1 ? 'FALSE' : 'TRUE'
+		})
 		const data = {
 			describes:form.value.describes,
 			deviceNumber:form.value.deviceNumber,
diff --git a/src/pages/upkeepOrder/addServiceRecord.vue b/src/pages/upkeepOrder/addServiceRecord.vue
index 7715ec9..8446884 100644
--- a/src/pages/upkeepOrder/addServiceRecord.vue
+++ b/src/pages/upkeepOrder/addServiceRecord.vue
@@ -400,6 +400,10 @@ const form = ref({
 	}
 	// 添加配件
 	function addSpare() {
+		if (!form1.value.number) {
+			proxy.$modal.showToast('请选择备件')
+			return;
+		}
 		if (!form1.value.qty || form1.value.qty == 0) {
 			proxy.$modal.showToast('请输入数量')
 			return;
@@ -451,7 +455,7 @@ const form = ref({
 		}
 		let str = array1.join('-') + ' ' + array2.join(':')
 		formatDate.value = str
-		form.value[field.value] = e.timestamp
+		form.value[field.value] = e.timestamp*1000
 	}
 	 onLoad(async(option) => {
 		if (option.type) type.value = option.type;
@@ -461,7 +465,7 @@ const form = ref({
 			.data)).id) {
 			form.value = JSON.parse(decodeURIComponent(option.data))
 			form.value.itemNumbers = form.value.items
-			formatDate.value = form.value.completionTime ? proxy.$time.formatDate(form.value.completionTime * 1000) : ''
+			formatDate.value = form.value.completionTime ? proxy.$time.formatDate(form.value.completionTime) : ''
 			 form.value.statusTxt =  form.value.status == 0 ? '完成' :'未完成'
 		};
 		jxDetailsStatus.value = await dictApi.getDict('jx_details_status')
diff --git a/src/pages/upkeepOrder/detail.vue b/src/pages/upkeepOrder/detail.vue
index 095cf54..c965b7e 100644
--- a/src/pages/upkeepOrder/detail.vue
+++ b/src/pages/upkeepOrder/detail.vue
@@ -103,7 +103,7 @@
 							</view>
 							<view class="dec2" v-if='item.status === 0 || item.status === "0"'>
 								<view>完成时间：</view>
-								<view>{{$time.formatDate(item.completionTime*1000)}}</view>
+								<view>{{$time.formatDate(item.completionTime)}}</view>
 							</view>
 							<view class="dec2">
 								<view>工程师确认：</view>