diff --git a/src/pages/devicesSearch/codeSearch.vue b/src/pages/devicesSearch/codeSearch.vue index 6d26c25..0784427 100644 --- a/src/pages/devicesSearch/codeSearch.vue +++ b/src/pages/devicesSearch/codeSearch.vue @@ -19,6 +19,15 @@ >编码检索 +
+ +
@@ -27,66 +36,66 @@ - - 激动角膜 + + {{formData?.maName ?? ''}} - - CJM-2 + + {{formData?.maModel ?? ''}} - - ceshi123 + + {{formData?.qrCode ?? ''}} - - ceshi123 + + {{formData?.maCode ?? ''}} - - 在用 + + {{formData?.maStatus ?? ''}} + + + {{formData?.thisCheckTime ?? ''}} + + + {{formData?.nextCheckTime ?? ''}} + + + {{formData?.inOutNum ?? ''}} + + + {{formData?.inTime ?? ''}} + + + {{formData?.serviceNum ?? ''}} + + + {{formData?.checkNum ?? ''}} + + + {{formData?.checkNum ?? ''}} + + + {{formData?.scrapTime ?? ''}} + + + {{}} + + + {{formData?.leaseUnit ?? ''}} + + + {{formData?.leaseProject ?? ''}} + + + {{formData?.leaseTime ?? ''}} + + + {{formData?.backUnit ?? ''}} + + + {{formData?.backProject ?? ''}} + + + {{formData?.backTime ?? ''}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -102,12 +111,36 @@ import { ref, computed, onUnmounted } from 'vue' import { onLoad, onShow, } from '@dcloudio/uni-app' import { debounce } from 'lodash-es' +import { getDeviceListAPI } from '@/services/picking/outbound.js' const queryParams = ref({}) -const formData = ref({}) +const formData = ref({ + maName: '', + maModel: '', + qrCode: '', + maCode: '', + maStatus: '', + thisCheckTime: '', + nextCheckTime: '', + inOutNum: '', + inTime: '', + serviceNum: '', + checkNum: '', + scrapTime: '', + statusName: '', + leaseUnit: '', + leaseProject: '', + leaseTime: '', + backUnit: '', + backProject: '', + backTime: '' +}) // 编码设备列表查询参数 const queryCodeParams = ref({ maCode: '', + maId:'', }) +const maId = ref('') +const optionList = ref([]) // 页面加载完毕 onLoad((options) => {}) @@ -121,12 +154,55 @@ const onCodeSearch = () => { const getCodeDeviceInfoData = async () => { console.log(queryCodeParams.value) // const res = await getCodeDeviceListAPI(queryCodeParams.value) - // console.log(res) + getDeviceListAPI({'maCode': queryCodeParams.value.maCode}).then(response => { + console.log("xxxxxxxxxxx",response) + if (response.data && response.data.length !== 0) { + optionList.value = response.data.map(option => ({ + value: option.maId, + text: option.maCode + })) + if(response.data.length === 1){ + formData.value = response.data[0] + } + }else{ + uni.showToast({ + title: '未查询到该编号信息', + icon: 'none', + duration: 2000 + }) + } + }) + console.log(res) } +// 标签变更处理 +const changeTag = async () => { + if (!maId.value) return + + try { + const response = await getDeviceListAPI({'maId': maId.value}) + if (response.data && response.data.length !== 0) { + formData.value = response.data[0] + } + } catch (error) { + console.error("获取编号信息失败", error) + uni.showToast({ + title: '获取信息失败', + icon: 'none', + duration: 2000 + }) + } +} + + + +.select-container { + margin-top: 10px; + + .data-select { + width: 100%; + z-index: 1000; + } +} + +.certificate-card { + width: 100%; + min-height: 300px; + margin-top: 15px; + position: relative; + border-radius: 8px; + overflow: visible; + + .certificate-content { + padding: 15px; + position: relative; + min-height: 300px; + } + + .title { + text-align: center; + font-weight: 500; + font-size: 18px; + margin-bottom: 15px; + letter-spacing: 2px; + } + + .info-row { + display: flex; + flex-wrap: wrap; + margin-bottom: 8px; + } + + .info-item { + display: flex; + align-items: center; + font-size: 14px; + padding: 4px 0; + min-height: 24px; + + &.full-width { + width: 100%; + } + + &.align-right { + justify-content: flex-end; + } + } + + .label { + font-weight: 500; + min-width: 90px; + } + + .value { + margin-left: 10px; + flex: 1; + } + + .conclusion { + color: #ef3e3e; + margin-right: 20px; + font-weight: bold; + } + + .report-link { + margin-left: 10px; + text-decoration: underline; + cursor: pointer; + font-weight: 500; + transition: all 0.3s; + + &:hover { + color: #0055aa; + transform: scale(1.05); + } + } + + .stamp-container { + position: absolute; + bottom: 10px; + left: 10px; + width: 140px; + height: 140px; + z-index: 10; + overflow: visible; /* 确保印章不会裁剪 */ + } + + .stamp-canvas { + width: 140px; + height: 140px; + } +} + +.green-certificate { + border: 6px solid #00904a; + + .title { + color: #00904a; + } + + .label { + color: #00904a; + } + + .report-link { + color: #00904a; + } +} + +.blue-certificate { + border: 6px solid #0055aa; + + .title { + color: #0055aa; + } + + .label { + color: #0055aa; + } + + .report-link { + color: #0055aa; + } +} + +:deep(.uni-select) { + z-index: 1001 !important; +} + \ No newline at end of file diff --git a/src/pages/materialsStation/index/index.vue b/src/pages/materialsStation/index/index.vue index f9125ad..86a15e0 100644 --- a/src/pages/materialsStation/index/index.vue +++ b/src/pages/materialsStation/index/index.vue @@ -122,7 +122,7 @@ const getUserInfoByUserName = async () => { const userName = userInfo.value.userName console.log('🚀 ~ getUserInfoByUserName ~ userName:', userName) const res = await getUserInfoByUserNameApi({ userName }) - idCard.value = res.data.idCard + idCard.value = res?.data?.idCard console.log('🚀 ~ getUserInfoByUserName ~ idCard.value:', idCard.value) uni.setStorageSync('idCard', idCard.value) } catch (error) { diff --git a/src/pages/materialsStation/toolsBack/toolsAddBack.vue b/src/pages/materialsStation/toolsBack/toolsAddBack.vue index f421b8b..48148f1 100644 --- a/src/pages/materialsStation/toolsBack/toolsAddBack.vue +++ b/src/pages/materialsStation/toolsBack/toolsAddBack.vue @@ -218,7 +218,7 @@ const getTeamList = async () => { const getProjectListApi = async () => { console.log('🚀 ~ 工程') try { - const res = await getProjectList({ unitId: null, isApp: true, teamName: formData.teamName }) + const res = await getProjectList({ unitId: null, isApp: true, teamId: formData.teamId }) if (!res.data || !res.data.length) return console.log('🚀 ~ getProjectListApi ~ res:', res) prodRange.value = res.data.map((item) => { diff --git a/src/pages/materialsStation/toolsBack/toolsBack.vue b/src/pages/materialsStation/toolsBack/toolsBack.vue index 5e2158a..a56dc01 100644 --- a/src/pages/materialsStation/toolsBack/toolsBack.vue +++ b/src/pages/materialsStation/toolsBack/toolsBack.vue @@ -45,7 +45,7 @@ - + { if (total.value === tableList.value.length) return true }) @@ -199,12 +200,14 @@ const onClickSwipe = async (e, item) => { // 删除 await deleteItem(item) } + swipeRef.value.closeAll() } catch (error) { console.error('操作失败:', error) uni.showToast({ title: error.message || '操作失败', icon: 'error', }) + swipeRef.value.closeAll() } } diff --git a/src/pages/materialsStation/toolsLease/codeOut.vue b/src/pages/materialsStation/toolsLease/codeOut.vue index 88a13c9..8d6a3a7 100644 --- a/src/pages/materialsStation/toolsLease/codeOut.vue +++ b/src/pages/materialsStation/toolsLease/codeOut.vue @@ -135,7 +135,7 @@ 规格型号： - {{ item.materialModel }} + {{ item.typeName }} @@ -191,7 +191,7 @@ const queryCodeParams = ref({ pageNum: 1, pageSize: 9999, typeId: '', - maStatus: 1, + // maStatus: 1, maCode: '', }) const qrCodeScan = ref('') @@ -217,6 +217,8 @@ onLoad((opt) => { // queryParamsTemp.value.id = queryParamsTemp.value.parentId console.log('xxxxxxxx', queryParamsTemp.value) queryCodeParams.value.typeId = queryParamsTemp.value.typeId + queryCodeParams.value.proId = queryParamsTemp.value.proId + queryCodeParams.value.teamId = queryParamsTemp.value.teamId queryParams.value = { ...queryParamsTemp.value } if (queryParamsTemp.value.isBack) { getCodeList() // 获取编码列表 diff --git a/src/pages/materialsStation/toolsLease/toolsLease.vue b/src/pages/materialsStation/toolsLease/toolsLease.vue index c159eef..5568b1c 100644 --- a/src/pages/materialsStation/toolsLease/toolsLease.vue +++ b/src/pages/materialsStation/toolsLease/toolsLease.vue @@ -45,7 +45,7 @@ - + { if (total.value === tableList.value.length) return true @@ -196,7 +197,7 @@ const onScrollTolower = () => { } // 滑动 -const onClickSwipe = async (e, item) => { +const onClickSwipe = async (e, item, itemIndex) => { console.log('🚀 ~ onClickSwipe ~ e:', e, item) if (e.content.text == '电子签名') { // 电子签名 @@ -205,6 +206,7 @@ const onClickSwipe = async (e, item) => { const params = { id: item.id, leaseSignUrl: item.leaseSignUrl, + leaseSignType: item.leaseSignType, isToolsLease: true, } uni.navigateTo({ @@ -225,6 +227,7 @@ const onClickSwipe = async (e, item) => { // 删除 deleteItem(item) } + swipeRef.value.closeAll() } // 删除 diff --git a/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue b/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue index b818625..37ea7b8 100644 --- a/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue +++ b/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue @@ -82,7 +82,7 @@ 规格型号 在库数 在用数 - 预领数 + 预领数 {{ opts.isOut ? '出库数' : '领用数' }} 操作 @@ -94,7 +94,7 @@ {{ item.storageNum }} {{ item.useNum }} - {{ item.preNum }} + {{ item.preNum }}