From 986da22689dc9a5faef751c02348fb1f47584414 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:53:01 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA

---
 components/oi-form/list/input-number/index.vue |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/components/oi-form/list/input-number/index.vue b/components/oi-form/list/input-number/index.vue
index 0063d6d..22e57c6 100644
--- a/components/oi-form/list/input-number/index.vue
+++ b/components/oi-form/list/input-number/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="oi-form-input-number">
-		<input v-if="model" type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''" v-model="model[data.fieldId]" :focus="focus"
+			<input v-if="model" type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''" v-model="model[data.fieldId]" :focus="focus"
 			:placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
 			:disabled="data.disabled"></input>
-		<input v-else type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''" v-model="data.value" :focus="focus"
-			:placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
+		<input v-else type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''" v-model="data.value"
+			:focus="focus" :placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
 			:disabled="data.disabled"></input>
 	</view>
 </template>
@@ -25,25 +25,26 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", e)
+				this.$emit("on-change", e)
 			},
 			onConfirm(e) {
 				this.onChange(e)
 			},
 			onClick(e) {
-				this.$emit("click", e)
+				this.$emit("on-click", e)
 			},
-		
-		}
+			onFocus(e) {
+				this.$emit("on-focus", e)
+			},
+
+		},
 	};
 </script>
 
 <style lang="less" scoped>
 	.oi-form-input-number {
-		border: 1px solid #d5d5d5;
-				width: calc(100%- 6rpx);
-		border-radius: 6px !important;
-		padding: 3rpx;
+		width: 100%;
+
 		.input-disabled {
 			background-color: #f3f3f3 !important;
 		}
@@ -65,8 +66,9 @@
 			transition-duration: 0.1s;
 			vertical-align: middle;
 		}
-	}
-	.oi-form-input-number:hover {
-		border: 1px solid rgb(41, 121, 255);
+
+		.oi-input-number:hover {
+			border: 1px solid rgb(41, 121, 255);
+		}
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1