From f6427b5dea54bbb8761fade351e9f86404b2fb61 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 30 三月 2026 10:22:59 +0800
Subject: [PATCH] fix: 规格型号搜索
---
src/pages/qualityManagement/nonconformingManagement/index.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/pages/qualityManagement/nonconformingManagement/index.vue b/src/pages/qualityManagement/nonconformingManagement/index.vue
index 13b65c3..41e5478 100644
--- a/src/pages/qualityManagement/nonconformingManagement/index.vue
+++ b/src/pages/qualityManagement/nonconformingManagement/index.vue
@@ -54,7 +54,7 @@
</view>
<view class="card-actions">
<view class="btn-link btn-link-primary" v-if="item.inspectState == 0" @click.stop="openDealDialog(item)">澶勭悊</view>
- <view class="btn-link btn-link-plain" v-if="item.inspectState == 0 && hasNonconformingEdit" @click.stop="openForm('edit', item)">缂栬緫</view>
+ <view class="btn-link btn-link-plain" v-if="hasNonconformingEdit" @click.stop="openForm('edit', item)">缂栬緫</view>
<view class="btn-link btn-link-warn" v-if="hasNonconformingCancel" @click.stop="handleDelete(item)">鍒犻櫎</view>
</view>
</view>
@@ -136,7 +136,7 @@
<up-datetime-picker
:show="showEntryStartPicker"
v-model="entryStartValue"
- mode="date"
+ mode="year-month"
@confirm="confirmEntryStart"
@cancel="showEntryStartPicker = false"
/>
@@ -144,7 +144,7 @@
<up-datetime-picker
:show="showEntryEndPicker"
v-model="entryEndValue"
- mode="date"
+ mode="year-month"
@confirm="confirmEntryEnd"
@cancel="showEntryEndPicker = false"
/>
@@ -306,19 +306,19 @@
};
const openDateRange = () => {
- entryStartValue.value = searchForm.entryDateStart ? dayjs(searchForm.entryDateStart, 'YYYY-MM-DD').valueOf() : Date.now()
+ entryStartValue.value = searchForm.entryDateStart ? dayjs(searchForm.entryDateStart).valueOf() : Date.now()
showEntryStartPicker.value = true
}
const confirmEntryStart = (e) => {
const ts = e?.value ?? entryStartValue.value
- searchForm.entryDateStart = dayjs(ts).format('YYYY-MM-DD')
+ searchForm.entryDateStart = `${dayjs(ts).format('YYYY-MM')}-01`
showEntryStartPicker.value = false
- entryEndValue.value = searchForm.entryDateEnd ? dayjs(searchForm.entryDateEnd, 'YYYY-MM-DD').valueOf() : Date.now()
+ entryEndValue.value = searchForm.entryDateEnd ? dayjs(searchForm.entryDateEnd).valueOf() : Date.now()
showEntryEndPicker.value = true
}
const confirmEntryEnd = (e) => {
const ts = e?.value ?? entryEndValue.value
- searchForm.entryDateEnd = dayjs(ts).format('YYYY-MM-DD')
+ searchForm.entryDateEnd = `${dayjs(ts).format('YYYY-MM')}-01`
showEntryEndPicker.value = false
handleQuery()
}
@@ -377,14 +377,22 @@
};
const openForm = (type, row) => {
- if (type === 'edit' && !hasNonconformingEdit.value) return
- if (type !== 'add' && row?.inspectState == 1) {
- toast('宸插鐞嗙殑鏁版嵁涓嶈兘鍐嶇紪杈�')
- return
- }
+ // if (type === 'edit' && !hasNonconformingEdit.value) return
+ // if (type !== 'add' && row?.inspectState == 1) {
+ // toast('宸插鐞嗙殑鏁版嵁涓嶈兘鍐嶇紪杈�')
+ // return
+ // }
const id = row?.id
+ let fallback = ''
+ if (row) {
+ const fallbackData = {
+ batchNo: row.batchNo ?? '',
+ checkType: row.checkType ?? row.inspectType ?? ''
+ }
+ fallback = `&fallback=${encodeURIComponent(JSON.stringify(fallbackData))}`
+ }
uni.navigateTo({
- url: `/pages/qualityManagement/nonconformingManagement/form?type=${type}${id ? `&id=${id}` : ''}`
+ url: `/pages/qualityManagement/nonconformingManagement/form?type=${type}${id ? `&id=${id}` : ''}${fallback}`
})
}
--
Gitblit v1.9.3