diff --git a/package.json b/package.json
index e0f7373..161beea 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
"mqtt": "4.1.0",
"pinia": "2.0.17",
"tslib": "^2.6.2",
- "uview-plus": "^3.1.45",
+ "uview-plus": "^3.7.36",
"vue": "3.4.23",
"vue-i18n": "9.10.2"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f7476de..4670457 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -89,8 +89,8 @@ importers:
specifier: ^2.6.2
version: 2.6.2
uview-plus:
- specifier: ^3.1.45
- version: 3.1.45
+ specifier: ^3.7.36
+ version: 3.7.36
vue:
specifier: 3.4.23
version: 3.4.23(typescript@4.9.5)
@@ -3938,9 +3938,9 @@ packages:
resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
engines: {node: '>= 0.4.0'}
- uview-plus@3.1.45:
- resolution: {integrity: sha512-JHgLp2heaMciLdGimO/v4tMM8iwb2vTEOk6sXqn5X198AHjM5A/IGzH84GZPvUISFTEJbxGEHiGPxpv2K26AGw==}
- engines: {HBuilderX: ^3.1.0}
+ uview-plus@3.7.36:
+ resolution: {integrity: sha512-44pW0oKKatYxCHhXPljaNv5E+CESSJlhsz0FRZRNpMv1ms02m5Agk+CNpgDnv/XNHt9YxHdYSYerN+xnNP5orw==}
+ engines: {HBuilderX: ^3.1.0, uni-app: ^4.66, uni-app-x: ''}
v8-to-istanbul@8.1.1:
resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
@@ -9185,10 +9185,7 @@ snapshots:
utils-merge@1.0.1: {}
- uview-plus@3.1.45:
- dependencies:
- clipboard: 2.0.11
- dayjs: 1.11.9
+ uview-plus@3.7.36: {}
v8-to-istanbul@8.1.1:
dependencies:
diff --git a/src/components/common/CopyButton.vue b/src/components/common/CopyButton.vue
new file mode 100644
index 0000000..4b34e82
--- /dev/null
+++ b/src/components/common/CopyButton.vue
@@ -0,0 +1,109 @@
+
+
+ 📋
+
+
+
+
+
+
diff --git a/src/pages_function/pages/moldLedger/index.vue b/src/pages_function/pages/moldLedger/index.vue
index a6e8dcc..367be9b 100644
--- a/src/pages_function/pages/moldLedger/index.vue
+++ b/src/pages_function/pages/moldLedger/index.vue
@@ -53,14 +53,6 @@
-
- 模具型号
- {{ textValue(item.brandName) }}
-
-
- 使用设备
- {{ textValue(item.machineName || item.machineId) }}
-
使用次数
{{ textValue(item.useTime) }}
diff --git a/src/pages_function/pages/moldType/detail.vue b/src/pages_function/pages/moldType/detail.vue
index 41ffb4f..7f56f44 100644
--- a/src/pages_function/pages/moldType/detail.vue
+++ b/src/pages_function/pages/moldType/detail.vue
@@ -38,10 +38,6 @@
维保周期
{{ fieldValue('maintainTime') }}
-
- 产品ID
- {{ fieldValue('productId') }}
-
是否启用
{{ enableText }}
diff --git a/src/pages_function/pages/moldType/index.vue b/src/pages_function/pages/moldType/index.vue
index 457e59e..9c508b1 100644
--- a/src/pages_function/pages/moldType/index.vue
+++ b/src/pages_function/pages/moldType/index.vue
@@ -37,7 +37,10 @@
@@ -121,10 +124,6 @@
模穴数 *
-
- 产品ID *
-
-
备注
@@ -148,6 +147,7 @@
import { ref, reactive } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import AppTitleHeader from '@/components/common/AppTitleHeader.vue'
+import CopyButton from '@/components/common/CopyButton.vue'
import { createMoldBrand, deleteMoldBrand, getMoldBrandDetail, getMoldBrandPage, updateMoldBrand } from '@/api/mes/mold'
import { DICT_TYPE, getDictLabel, initAllDict } from '@/utils/dict'
@@ -171,7 +171,6 @@ const formData = reactive({
orgType: '',
useTime: '',
moldSize: '',
- productId: '',
remark: ''
})
@@ -322,7 +321,6 @@ async function openEdit(item) {
formData.orgType = textValueForInput(detail?.orgType)
formData.useTime = textValueForInput(detail?.useTime)
formData.moldSize = textValueForInput(detail?.moldSize)
- formData.productId = textValueForInput(detail?.productId)
formData.remark = textValueForInput(detail?.remark)
formPopupRef.value?.open()
} catch (e) {
@@ -361,8 +359,8 @@ async function submitForm() {
uni.showToast({ title: '编码、名称、规格必填', icon: 'none' })
return
}
- if (String(formData.productId).trim() === '' || String(formData.moldSize).trim() === '') {
- uni.showToast({ title: '产品ID、模穴数必填', icon: 'none' })
+ if (String(formData.moldSize).trim() === '') {
+ uni.showToast({ title: '模穴数必填', icon: 'none' })
return
}
const payload = {
@@ -373,7 +371,6 @@ async function submitForm() {
orgType: formData.orgType.trim() || undefined,
useTime: toNumberOrUndefined(formData.useTime),
moldSize: toNumberOrUndefined(formData.moldSize),
- productId: toNumberOrUndefined(formData.productId),
remark: formData.remark.trim() || undefined,
isEnable: true
}
@@ -400,7 +397,6 @@ function resetForm() {
formData.orgType = ''
formData.useTime = ''
formData.moldSize = ''
- formData.productId = ''
formData.remark = ''
}
@@ -576,6 +572,12 @@ function openDetail(item) {
color: #8a9099;
}
+.code-wrapper {
+ display: flex;
+ align-items: center;
+ gap: 8rpx;
+}
+
.arrow {
font-size: 44rpx;
color: #a1a8b0;