diff --git a/src/pages/dateUpdate/index.vue b/src/pages/dateUpdate/index.vue index 8afbac9..8a190ce 100644 --- a/src/pages/dateUpdate/index.vue +++ b/src/pages/dateUpdate/index.vue @@ -108,7 +108,6 @@ const onQrCode = () => { const handleSearch = () => { console.log('🚀 ~ handleSearch ~ 查询:', keyWord.value) - // typeList.value =[]; reset() getWsMaInfoList({ maCode: keyWord.value }).then(res => { if (res.code === 200 && res.data && res.data.length > 0) { @@ -116,9 +115,7 @@ const handleSearch = () => { return { id: option.id, label: option.maName + '-' + option.maModel + '-' + option.maCode, - /* isChecked: 1,*/ item: option, - } }) if (res.data.length === 1) { @@ -164,7 +161,7 @@ const handleCheck = (item) => { // 处理扫描成功事件 const handleScanSuccess = (result) => { - keyWord.value = result?.data?.split('?qrcode=')[1] || result?.data + keyWord.value = result?.data?.split('?qrcode=')[1] if (keyWord.value === '') { uni.showToast({ title: '扫码识别失败', icon: 'none' }) } else { @@ -293,13 +290,17 @@ const handleSubmit = () => { // 底部按钮 .btn { - margin-top: auto; - padding: 32rpx; - // background: #fff; - // box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.05); + position: fixed; + bottom: 0; + left: 0; + width: calc(100% - 20px); + background-color: #fff; /* 可根据需要设定背景色 */ + padding: 10px; + box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); /* 可选:添加顶部阴影 */ display: flex; - justify-content: space-between; - gap: 24rpx; + justify-content: center; /* 水平居中 */ + gap: 10px; /* 按钮间距 */ + z-index: 999; /* 保证显示在最上层 */ .btn-cont { flex: 1; diff --git a/src/pages/nameplateUpdate/index.vue b/src/pages/nameplateUpdate/index.vue index 00a5c4a..4d97dc8 100644 --- a/src/pages/nameplateUpdate/index.vue +++ b/src/pages/nameplateUpdate/index.vue @@ -1,346 +1,424 @@ - - - - - - - - - - 二维码 - - - - - - - - 查询 - - - - - {{ typeName || '请选择对应机具' }} - + + + + + + - - 设备类型:{{ formData.materialName }} - - *规格型号: - - 二维码:{{ formData.qrCode }} - 设备编码:{{ formData.maCode }} - 设备状态:{{ formData.maStatus }} - - 本次检修人员: - - - 本次检修时间: - - - - 下次检修时间: - - - - *出厂时间: - - - - *机具厂家: - - {{ formData.maVender || '请选择' }} - - - - - 确认修改 - - + + + + + + + 查询 + + + 二维码 + + + - - - {{ item.name }} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确认 + + + + + - diff --git a/src/pages/repair/wsMaInfo/index.vue b/src/pages/repair/wsMaInfo/index.vue index 2b6474d..121d487 100644 --- a/src/pages/repair/wsMaInfo/index.vue +++ b/src/pages/repair/wsMaInfo/index.vue @@ -293,8 +293,7 @@ onLoad(() => {