Merge remote-tracking branch 'origin/master'

master
zhongwenkai 1 week ago
commit 661d85b383

@ -22,10 +22,11 @@ export function getUserProfile() {
})
}
export function getSimpleUserList() {
export function getSimpleUserList(params) {
return request({
url: '/admin-api/system/user/simple-list',
method: 'get'
method: 'get',
params
})
}

@ -200,6 +200,7 @@ export default {
loadFailed: 'Load failed',
deleteSuccess: 'Deleted successfully',
deleteFailed: 'Delete failed',
saveSuccess: 'Saved successfully',
saveFailed: 'Save failed',
createSuccess: 'Created successfully',
updateSuccess: 'Updated successfully',
@ -1332,6 +1333,7 @@ export default {
placeholderRequireDate: 'Select require date',
placeholderAcceptedBy: 'Select repair user',
placeholderConfirmBy: 'Select confirm user',
placeholderUserSearch: 'Search by nickname',
placeholderMold: 'Select mold',
placeholderMoldNameAuto: 'Auto filled',
placeholderMoldCodeAuto: 'Auto filled',
@ -1351,6 +1353,7 @@ export default {
moldNotFound: 'Mold not found',
scanFailed: 'Scan failed',
maxUploadCount: 'Max 9 images',
noUserData: 'No user data',
saving: 'Saving',
saveSuccess: 'Saved successfully',
submitSuccess: 'Submitted successfully',
@ -1364,6 +1367,7 @@ export default {
validatorFaultLevelRequired: 'Fault level is required',
validatorIsShutdownRequired: 'Is shutdown is required',
validatorFaultPhenomenonRequired: 'Fault phenomenon is required',
validatorUserRequired: 'Please select a user',
validatorRepairStatusRequired: 'Repair result is required',
validatorFinishDateRequired: 'Finish date is required',
validatorConfirmDateRequired: 'Confirm date is required'

@ -200,6 +200,7 @@ export default {
loadFailed: '加载失败',
deleteSuccess: '删除成功',
deleteFailed: '删除失败',
saveSuccess: '保存成功',
saveFailed: '保存失败',
createSuccess: '新增成功',
updateSuccess: '更新成功',
@ -1335,6 +1336,7 @@ export default {
placeholderRequireDate: '请选择报修日期',
placeholderAcceptedBy: '请选择维修人员',
placeholderConfirmBy: '请选择验收人员',
placeholderUserSearch: '请输入姓名搜索',
placeholderMold: '请选择模具',
placeholderMoldNameAuto: '自动带出',
placeholderMoldCodeAuto: '自动带出',
@ -1354,6 +1356,7 @@ export default {
moldNotFound: '未找到对应模具',
scanFailed: '扫码失败',
maxUploadCount: '最多上传 9 张图片',
noUserData: '暂无人员数据',
saving: '保存中',
saveSuccess: '保存成功',
submitSuccess: '提交成功',
@ -1367,6 +1370,7 @@ export default {
validatorFaultLevelRequired: '请选择故障等级',
validatorIsShutdownRequired: '请选择是否停机',
validatorFaultPhenomenonRequired: '请输入故障现象',
validatorUserRequired: '请选择人员',
validatorRepairStatusRequired: '请选择维修结果',
validatorFinishDateRequired: '请选择完成日期',
validatorConfirmDateRequired: '请选择验收日期'

@ -669,6 +669,13 @@
"navigationStyle": "custom"
}
},
{
"path": "moldRepair/userSelect",
"style": {
"navigationBarTitleText": "选择人员",
"navigationStyle": "custom"
}
},
{
"path": "moldInspectionItems/index",
"style": {

@ -3,8 +3,7 @@
<NavBar :title="t('moldPressureNet.moduleName')">
<template #right>
<view class="nav-right-btn" @click="goHistory">
<uni-icons type="clock" size="22" color="#1f7cff"></uni-icons>
<text class="nav-right-text">{{ t('moldPressureNet.history') }}</text>
<uni-icons type="calendar" size="22" color="#22486e"></uni-icons>
</view>
</template>
</NavBar>
@ -83,7 +82,12 @@
</view>
<view class="form-field">
<text class="form-label">{{ t('moldPressureNet.pressureNetTime') }}<text class="required-star">*</text></text>
<uni-datetime-picker v-model="pressureNetTime" type="datetime" :clear-icon="false" />
<uni-datetime-picker
v-model="pressureNetTime"
type="datetime"
:clear-icon="false"
@change="onPressureNetTimeChange"
/>
</view>
<view class="form-field">
<text class="form-label">{{ t('moldPressureNet.remark') }}</text>
@ -317,6 +321,14 @@ function goHistory() {
uni.navigateTo({ url: '/pages_function/pages/moldPressureNet/history' })
}
function onPressureNetTimeChange(value) {
const normalizedValue = normalizePressureNetTime(value)
pressureNetTime.value = normalizedValue
setTimeout(() => {
pressureNetTime.value = normalizePressureNetTime(pressureNetTime.value || value) || normalizedValue
}, 0)
}
async function handleSubmit() {
if (submitLoading.value) return
if (!selectedBrand.id) {
@ -327,7 +339,8 @@ async function handleSubmit() {
uni.showToast({ title: t('moldPressureNet.selectSubMoldError'), icon: 'none' })
return
}
if (!pressureNetTime.value) {
const normalizedPressureNetTime = normalizePressureNetTime(pressureNetTime.value)
if (!normalizedPressureNetTime) {
uni.showToast({ title: t('moldPressureNet.selectReplaceTimeError'), icon: 'none' })
return
}
@ -342,12 +355,12 @@ async function handleSubmit() {
moldBrandName: selectedBrand.name,
moldId: moldId,
moldName: selected?.name || '',
pressureNetTime: pressureNetTime.value,
pressureNetTime: normalizedPressureNetTime,
remark: remark.value.trim() || undefined
}
})
await createPressureNetRecord(createReqVOList)
uni.showToast({ title: t('moldPressureNet.submitSuccess'), icon: 'success' })
uni.showToast({ title: t('functionCommon.saveSuccess'), icon: 'success' })
//
selectedBrand.id = ''
selectedBrand.name = ''
@ -362,12 +375,31 @@ async function handleSubmit() {
submitLoading.value = false
}
}
function normalizePressureNetTime(value) {
const text = String(value || '').trim().replace(/\//g, '-')
const dateOnlyMatch = text.match(/^(\d{4}-\d{2}-\d{2})(?:\s+(?:undefined|null|选择时间|select time))?$/i)
if (dateOnlyMatch) {
return `${dateOnlyMatch[1]} ${getCurrentTime()}`
}
const dateTimeMatch = text.match(/^(\d{4}-\d{2}-\d{2})[ T](\d{2}):(\d{2})(?::(\d{2}))?$/)
if (!dateTimeMatch) return ''
const [, date, hour, minute, second = '00'] = dateTimeMatch
return `${date} ${hour}:${minute}:${second}`
}
function getCurrentTime() {
const date = new Date()
const hour = String(date.getHours()).padStart(2, '0')
const minute = String(date.getMinutes()).padStart(2, '0')
const second = String(date.getSeconds()).padStart(2, '0')
return `${hour}:${minute}:${second}`
}
</script>
<style lang="scss" scoped>
.page-container { min-height: 100vh; background-color: #f5f7fb; }
.nav-right-btn { display: flex; align-items: center; gap: 6rpx; padding: 8rpx 18rpx; background: #ffffff; border-radius: 999rpx; box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08); }
.nav-right-text { font-size: 24rpx; color: #374151; font-weight: 500; }
.nav-right-btn { width: 64rpx; height: 64rpx; display: flex; align-items: center; justify-content: center; background: #ffffff; border-radius: 50%; box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08); }
.detail-scroll { height: calc(100vh - 172rpx); }
.content-section { padding: 20rpx 24rpx 28rpx; }
.section-card { background: #ffffff; border-radius: 20rpx; padding: 24rpx; margin-bottom: 20rpx; border: 1rpx solid #eef2f7; box-shadow: 0 6rpx 18rpx rgba(15, 23, 42, 0.04); }

@ -37,16 +37,18 @@
<view class="form-item">
<text class="form-label">{{ t('moldRepair.acceptedBy') }}</text>
<picker :range="userLabels" :value="acceptedByIndex" :disabled="readonlyMeta" @change="(e) => onUserChange('acceptedBy', e)">
<view :class="['picker-field', !formData.acceptedBy ? 'is-placeholder' : '']">{{ acceptedByLabel }}</view>
</picker>
<view :class="['picker-field', !formData.acceptedBy ? 'is-placeholder' : '', readonlyMeta ? 'is-disabled' : '']" @click="openUserSelect('acceptedBy')">
<text>{{ acceptedByLabel }}</text>
<uni-icons v-if="!readonlyMeta" type="right" size="16" color="#9ca3af"></uni-icons>
</view>
</view>
<view class="form-item">
<text class="form-label">{{ t('moldRepair.confirmBy') }}</text>
<picker :range="userLabels" :value="confirmByIndex" :disabled="readonlyMeta" @change="(e) => onUserChange('confirmBy', e)">
<view :class="['picker-field', !formData.confirmBy ? 'is-placeholder' : '']">{{ confirmByLabel }}</view>
</picker>
<view :class="['picker-field', !formData.confirmBy ? 'is-placeholder' : '', readonlyMeta ? 'is-disabled' : '']" @click="openUserSelect('confirmBy')">
<text>{{ confirmByLabel }}</text>
<uni-icons v-if="!readonlyMeta" type="right" size="16" color="#9ca3af"></uni-icons>
</view>
</view>
<view class="form-item inline-radio">
@ -219,7 +221,7 @@
<script setup>
import { computed, reactive, ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { onLoad, onShow } from '@dcloudio/uni-app'
import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue'
import { getBrandList } from '@/api/mes/mold'
@ -240,6 +242,7 @@ const repairId = ref('')
const users = ref([])
const moldOptions = ref([])
const loading = ref(false)
const today = getTodayDate()
const formData = reactive({
id: undefined,
@ -249,9 +252,9 @@ const formData = reactive({
moldId: undefined,
moldCode: '',
moldName: '',
requireDate: '',
finishDate: '',
confirmDate: '',
requireDate: today,
finishDate: today,
confirmDate: today,
repairStatus: '0',
repairResult: '0',
acceptedBy: '',
@ -291,7 +294,6 @@ const statusLabel = computed(() => {
if (normalized === '2') return t('moldRepair.statusRejected')
return t('moldRepair.statusPending')
})
const userLabels = computed(() => users.value.map((item) => item.nickname || item.name || String(item.id || '')))
const moldLabels = computed(() => moldOptions.value.map((item) => item.label))
const faultLevelOptions = computed(() => {
const dicts = dictStore.getDict(DICT_TYPE.FAILURE_LEVEL) || []
@ -302,8 +304,6 @@ const faultLevelOptions = computed(() => {
value: String(item.value)
}))
})
const acceptedByIndex = computed(() => findUserIndex(formData.acceptedBy))
const confirmByIndex = computed(() => findUserIndex(formData.confirmBy))
const acceptedByLabel = computed(() => resolveUserLabel(formData.acceptedBy, t('moldRepair.placeholderAcceptedBy')))
const confirmByLabel = computed(() => resolveUserLabel(formData.confirmBy, t('moldRepair.placeholderConfirmBy')))
const moldIndex = computed(() => {
@ -327,6 +327,10 @@ onLoad(async (options) => {
}
})
onShow(() => {
applySelectedUser()
})
async function fetchUsers() {
try {
const res = await getSimpleUserList()
@ -373,9 +377,9 @@ async function fetchDetail(id) {
formData.moldId = detail?.moldId ?? detail?.machineryId
formData.moldCode = inputValue(detail?.moldCode ?? detail?.machineryCode)
formData.moldName = inputValue(detail?.moldName ?? detail?.machineryName)
formData.requireDate = formatPickerDate(detail?.requireDate)
formData.finishDate = formatPickerDate(detail?.finishDate)
formData.confirmDate = formatPickerDate(detail?.confirmDate)
formData.requireDate = defaultDateValue(detail?.requireDate)
formData.finishDate = defaultDateValue(detail?.finishDate)
formData.confirmDate = defaultDateValue(detail?.confirmDate)
formData.repairStatus = normalizedRepairStatus
formData.repairResult = normalizedRepairStatus
formData.acceptedBy = normalizeUserId(detail?.acceptedBy)
@ -423,12 +427,6 @@ function onDateChange(field, event) {
formData[field] = String(event?.detail?.value || '')
}
function onUserChange(field, event) {
const index = Number(event?.detail?.value || 0)
const current = users.value[index]
formData[field] = current ? String(current.id) : ''
}
function onMoldChange(event) {
const index = Number(event?.detail?.value || 0)
const current = moldOptions.value[index]
@ -501,12 +499,6 @@ function onRepairStatusChange(event) {
formData.repairResult = value
}
function findUserIndex(value) {
if (value === undefined || value === null || value === '') return 0
const index = users.value.findIndex((item) => String(item.id) === String(value) || item.nickname === String(value))
return index >= 0 ? index : 0
}
function resolveUserLabel(value, placeholder) {
if (value === undefined || value === null || value === '') return placeholder
const current = users.value.find((item) => String(item.id) === String(value) || item.nickname === String(value))
@ -529,6 +521,36 @@ function datePickerValue(value) {
return value || formatPickerDate(Date.now())
}
function openUserSelect(field) {
if (readonlyMeta.value) return
const selectedId = field === 'acceptedBy' ? formData.acceptedBy : formData.confirmBy
uni.navigateTo({
url: `/pages_function/pages/moldRepair/userSelect?field=${encodeURIComponent(field)}&selectedId=${encodeURIComponent(String(selectedId || ''))}`
})
}
function applySelectedUser() {
const result = getApp().globalData._moldRepairUserSelectResult
if (!result?.field || !result?.user) return
getApp().globalData._moldRepairUserSelectResult = null
const field = result.field === 'confirmBy' ? 'confirmBy' : 'acceptedBy'
const user = result.user
formData[field] = String(user.id || '')
if (user.id !== undefined && user.id !== null && !users.value.some((item) => String(item.id) === String(user.id))) {
users.value = [user, ...users.value]
}
}
function getTodayDate() {
return formatPickerDate(Date.now())
}
function defaultDateValue(value) {
const formatted = formatPickerDate(value)
if (formatted) return formatted
return mode.value === 'detail' ? '' : today
}
function formatPickerDate(value) {
if (value === undefined || value === null || value === '') return ''
const date = parseDate(value)
@ -817,6 +839,8 @@ function goBack() {
padding: 0 20rpx;
display: flex;
align-items: center;
justify-content: space-between;
gap: 16rpx;
}
.form-textarea {
@ -828,6 +852,10 @@ function goBack() {
color: #9ca3af;
}
.picker-field.is-disabled {
color: #9ca3af;
}
.code-row {
display: flex;
align-items: center;

@ -0,0 +1,257 @@
<template>
<view class="page-container">
<NavBar :title="pageTitle" />
<view class="search-bar">
<view class="search-input-wrap">
<text class="search-icon iconfont icon-search"></text>
<input
v-model="searchText"
class="search-input"
type="text"
:placeholder="t('moldRepair.placeholderUserSearch')"
placeholder-class="search-placeholder"
confirm-type="search"
@input="onSearchInput"
@confirm="loadUsers"
/>
<text v-if="searchText" class="search-clear" @click="clearSearch">x</text>
</view>
</view>
<scroll-view v-if="userList.length > 0" scroll-y class="user-list">
<view
v-for="user in userList"
:key="user.id"
class="user-card"
:class="{ active: String(selectedId) === String(user.id) }"
@click="selectedId = user.id"
>
<text class="user-name">{{ textValue(user.nickname) }}</text>
<view class="user-meta">
<text class="user-meta-text">ID: {{ textValue(user.id) }}</text>
<text v-if="user.deptName" class="user-meta-divider">|</text>
<text v-if="user.deptName" class="user-meta-text">{{ textValue(user.deptName) }}</text>
</view>
</view>
</scroll-view>
<view v-else class="empty-wrap">
<text v-if="loading" class="empty-text">{{ t('functionCommon.loading') }}</text>
<text v-else class="empty-text">{{ t('moldRepair.noUserData') }}</text>
</view>
<view class="bottom-actions">
<view class="bottom-btn confirm-btn" @click="handleConfirm">
{{ t('functionCommon.confirm') }}
</view>
</view>
</view>
</template>
<script setup>
import { computed, ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { useI18n } from 'vue-i18n'
import NavBar from '@/components/common/NavBar.vue'
import { getSimpleUserList } from '@/api/system/user'
const { t } = useI18n()
const field = ref('acceptedBy')
const selectedId = ref('')
const searchText = ref('')
const userList = ref([])
const loading = ref(false)
let searchTimer = null
const pageTitle = computed(() => {
return field.value === 'confirmBy' ? t('moldRepair.confirmBy') : t('moldRepair.acceptedBy')
})
onLoad(async (options) => {
field.value = String(options?.field || 'acceptedBy')
selectedId.value = String(options?.selectedId || '')
await loadUsers()
})
function onSearchInput() {
if (searchTimer) {
clearTimeout(searchTimer)
}
searchTimer = setTimeout(() => {
loadUsers()
}, 300)
}
function clearSearch() {
searchText.value = ''
loadUsers()
}
async function loadUsers() {
if (searchTimer) {
clearTimeout(searchTimer)
searchTimer = null
}
loading.value = true
try {
const nickname = searchText.value.trim()
const res = await getSimpleUserList({
nickname: nickname || undefined
})
const root = res && res.data !== undefined ? res.data : res
const data = Array.isArray(root) ? root : (Array.isArray(root?.data) ? root.data : [])
userList.value = Array.isArray(data) ? data : []
} catch (error) {
userList.value = []
} finally {
loading.value = false
}
}
function handleConfirm() {
if (!selectedId.value) {
uni.showToast({ title: t('moldRepair.validatorUserRequired'), icon: 'none' })
return
}
const user = userList.value.find((item) => String(item.id) === String(selectedId.value))
if (!user) {
uni.showToast({ title: t('moldRepair.validatorUserRequired'), icon: 'none' })
return
}
getApp().globalData._moldRepairUserSelectResult = {
field: field.value === 'confirmBy' ? 'confirmBy' : 'acceptedBy',
user
}
uni.navigateBack()
}
function textValue(value) {
if (value === 0) return '0'
if (value === null || value === undefined) return '-'
const text = String(value).trim()
return text || '-'
}
</script>
<style lang="scss" scoped>
.page-container {
min-height: 100vh;
background: #f5f6f8;
padding-bottom: 140rpx;
}
.search-bar {
padding: 16rpx 24rpx;
background: #fff;
}
.search-input-wrap {
display: flex;
align-items: center;
height: 72rpx;
padding: 0 16rpx;
background: #f5f6f8;
border-radius: 36rpx;
}
.search-icon {
font-size: 32rpx;
color: #999;
margin-right: 12rpx;
}
.search-input {
flex: 1;
font-size: 28rpx;
color: #333;
}
.search-placeholder {
color: #bbb;
}
.search-clear {
font-size: 28rpx;
color: #999;
padding: 8rpx;
}
.user-list {
padding: 16rpx 24rpx;
}
.user-card {
background: #fff;
border-radius: 14rpx;
padding: 28rpx 24rpx;
margin-bottom: 16rpx;
border: 2rpx solid transparent;
&.active {
border-color: #2563eb;
background: #f0f5ff;
}
}
.user-name {
font-size: 30rpx;
font-weight: 700;
color: #1a1a1a;
}
.user-meta {
display: flex;
align-items: center;
gap: 10rpx;
margin-top: 10rpx;
}
.user-meta-text {
font-size: 24rpx;
color: #7a8494;
line-height: 1.3;
}
.user-meta-divider {
font-size: 22rpx;
color: #c3cad5;
}
.empty-wrap {
padding: 120rpx 0;
text-align: center;
}
.empty-text {
font-size: 28rpx;
color: #999;
}
.bottom-actions {
position: fixed;
left: 0;
right: 0;
bottom: 0;
padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom));
background: #fff;
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
z-index: 99;
}
.bottom-btn {
width: 100%;
height: 84rpx;
line-height: 84rpx;
text-align: center;
border-radius: 16rpx;
font-size: 30rpx;
font-weight: 600;
}
.confirm-btn {
background: #1f4b79;
color: #fff;
}
</style>
Loading…
Cancel
Save