增强办公,新增审批,缺少电子签章功能

This commit is contained in:
2026-04-20 15:56:29 +08:00
parent a026ef7a54
commit cd71a3a457
18 changed files with 1791 additions and 537 deletions

View File

@@ -2,56 +2,175 @@
<view v-if="visible" class="mask" @tap="close">
<view class="sheet" @tap.stop>
<view class="sheet-header">
<text class="sheet-title">选择目的地</text>
<text class="sheet-title">选择城市</text>
<text class="sheet-close" @tap="close">关闭</text>
</view>
<view class="city-path">{{ pathLabel || '请选择目的地' }}</view>
<picker-view class="wheel" :value="pickerValue" @change="onChange">
<picker-view-column>
<view v-for="item in continents" :key="item.name" class="wheel-item"><text>{{ item.name }}</text></view>
</picker-view-column>
<picker-view-column>
<view v-for="item in countries" :key="item.name" class="wheel-item"><text>{{ item.name }}</text></view>
</picker-view-column>
<picker-view-column>
<view v-for="item in cities" :key="item" class="wheel-item"><text>{{ item }}</text></view>
</picker-view-column>
</picker-view>
<view class="footer">
<view class="tip-box">
<text class="tip-main">仅精确到城市即可</text>
<text class="tip-sub">如果列表里没有需要的城市可以先补录到上方再直接选择</text>
</view>
<view class="add-box">
<input v-model="newCountryName" class="add-input" type="text" placeholder="补录国家" />
<input v-model="newCityName" class="add-input" type="text" placeholder="补录城市" />
<button class="add-btn" :loading="adding" @tap="addNewCity">补录并新增</button>
</view>
<view class="city-path">{{ currentCountry && currentCity ? (currentCountry + ' / ' + currentCity) : '请选择城市' }}</view>
<view class="selector-wrap">
<picker-view class="picker-view" :value="pickerValue" @change="onPickerChange">
<picker-view-column>
<view v-for="item in countryOptions" :key="item.name" class="picker-item">
{{ item.name }}
</view>
</picker-view-column>
<picker-view-column>
<view v-for="item in currentCities" :key="item.cityId || item.cityName" class="picker-item">
{{ item.cityName }}
</view>
</picker-view-column>
</picker-view>
</view>
<view class="actions">
<button class="btn ghost" @tap="close">取消</button>
<button class="btn primary" @tap="confirm">确定</button>
<button class="btn primary" :disabled="!currentCity" @tap="confirm">确定</button>
</view>
</view>
</view>
</template>
<script>
const CITY_DATA = [
{ name: '亚洲', countries: [{ name: '中国', cities: ['北京', '上海', '广州', '深圳', '杭州', '成都'] }, { name: '日本', cities: ['东京', '大阪', '京都'] }, { name: '韩国', cities: ['首尔', '釜山'] }, { name: '新加坡', cities: ['新加坡'] }] },
{ name: '欧洲', countries: [{ name: '英国', cities: ['伦敦', '曼彻斯特'] }, { name: '法国', cities: ['巴黎', '里昂'] }, { name: '德国', cities: ['柏林', '慕尼黑'] }] },
{ name: '北美洲', countries: [{ name: '美国', cities: ['纽约', '洛杉矶', '旧金山'] }, { name: '加拿大', cities: ['多伦多', '温哥华'] }] },
{ name: '大洋洲', countries: [{ name: '澳大利亚', cities: ['悉尼', '墨尔本'] }, { name: '新西兰', cities: ['奥克兰', '惠灵顿'] }] }
]
import { listCities, addCity } from '@/api/fad/city'
export default {
props: { visible: Boolean, value: String },
emits: ['update:visible', 'change'],
data() { return { pickerValue: [0, 0, 0], cityData: CITY_DATA } },
computed: {
continents() { return this.cityData },
countries() { return this.continents[this.pickerValue[0]]?.countries || [] },
cities() { return this.countries[this.pickerValue[1]]?.cities || [] },
pathLabel() { const a = this.continents[this.pickerValue[0]]?.name || ''; const b = this.countries[this.pickerValue[1]]?.name || ''; const c = this.cities[this.pickerValue[2]] || ''; return [a,b,c].filter(Boolean).join(' / ') }
data() {
return {
loading: false,
adding: false,
countryOptions: [],
cityMap: {},
pickerValue: [0, 0],
currentCountry: '',
currentCity: '',
newCountryName: '',
newCityName: ''
}
},
computed: {
currentCities() {
return this.cityMap[this.currentCountry] || []
}
},
watch: {
visible(v) {
if (v) this.initValue()
}
},
watch: { visible(v) { if (v) this.initValue() } },
methods: {
initValue() { this.pickerValue = [0,0,0] },
onChange(e) { this.pickerValue = (e.detail.value || []).map(v => Number(v)) },
confirm() { this.$emit('change', this.pathLabel); this.close() },
close() { this.$emit('update:visible', false) }
async initValue() {
this.currentCountry = ''
this.currentCity = ''
this.newCountryName = ''
this.newCityName = ''
await this.loadOptions()
this.applyDefaultValue()
},
async loadOptions() {
this.loading = true
try {
const res = await listCities({ pageNum: 1, pageSize: 1000 })
const rows = res && (res.rows || (res.data && res.data.rows) || res.data || [])
const map = {}
const countries = []
rows.forEach(item => {
const country = item.countryName || ''
const city = item.cityName || ''
if (!country || !city) return
if (!map[country]) {
map[country] = []
countries.push({ name: country })
}
map[country].push(item)
})
this.countryOptions = countries
this.cityMap = map
} catch (e) {
uni.showToast({ title: e.message || '加载城市失败', icon: 'none' })
} finally {
this.loading = false
}
},
applyDefaultValue() {
const value = String(this.value || '')
for (let i = 0; i < this.countryOptions.length; i++) {
const country = this.countryOptions[i].name
const cityList = this.cityMap[country] || []
const j = cityList.findIndex(item => item.cityName === value)
if (j >= 0) {
this.pickerValue = [i, j]
this.currentCountry = country
this.currentCity = cityList[j].cityName
return
}
}
if (this.countryOptions.length) {
this.currentCountry = this.countryOptions[0].name
this.currentCity = (this.cityMap[this.currentCountry] || [])[0]?.cityName || ''
this.pickerValue = [0, 0]
}
},
close() {
this.$emit('update:visible', false)
},
onPickerChange(e) {
const value = (e.detail.value || []).map(v => Number(v))
const countryIndex = value[0] || 0
const country = this.countryOptions[countryIndex]?.name || ''
const cities = this.cityMap[country] || []
const cityIndex = Math.min(value[1] || 0, Math.max(cities.length - 1, 0))
this.pickerValue = [countryIndex, cityIndex]
this.currentCountry = country
this.currentCity = cities[cityIndex]?.cityName || ''
},
async addNewCity() {
const countryName = String(this.newCountryName || '').trim()
const cityName = String(this.newCityName || '').trim()
if (!countryName || !cityName) {
uni.showToast({ title: '请填写国家和城市', icon: 'none' })
return
}
this.adding = true
try {
await addCity({ countryName, cityName, status: 1, remark: '补录城市' })
uni.showToast({ title: '补录成功', icon: 'success' })
this.newCountryName = ''
this.newCityName = ''
await this.loadOptions()
this.currentCountry = countryName
this.currentCity = cityName
const countryIndex = this.countryOptions.findIndex(item => item.name === countryName)
const cityIndex = (this.cityMap[countryName] || []).findIndex(item => item.cityName === cityName)
this.pickerValue = [Math.max(countryIndex, 0), Math.max(cityIndex, 0)]
} catch (e) {
uni.showToast({ title: e.message || '补录失败', icon: 'none' })
} finally {
this.adding = false
}
},
confirm() {
if (!this.currentCity) return
this.$emit('change', this.currentCity)
this.close()
}
}
}
</script>
<style scoped>
.mask{position:fixed;inset:0;background:rgba(0,0,0,.45);z-index:1000;display:flex;align-items:flex-end}.sheet{width:100%;background:#fff;border-radius:24rpx 24rpx 0 0;padding:20rpx;box-sizing:border-box}.sheet-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.sheet-title{font-size:30rpx;font-weight:800}.sheet-close{font-size:26rpx;color:#1677ff}.city-path{padding:12rpx 16rpx;margin-bottom:12rpx;border-radius:16rpx;background:#f8fafc;color:#334155;font-size:24rpx}.wheel{height:520rpx}.wheel-item{display:flex;align-items:center;justify-content:center;height:88rpx}.footer{display:flex;gap:12rpx;margin-top:16rpx}.btn{flex:1;border-radius:16rpx}.btn.ghost{background:#f3f4f6;color:#334155}.btn.primary{background:#1677ff;color:#fff}
</style>
.mask{position:fixed;inset:0;background:rgba(0,0,0,.45);z-index:1000;display:flex;align-items:flex-end}.sheet{width:100%;background:#fff;border-radius:24rpx 24rpx 0 0;padding:20rpx;box-sizing:border-box}.sheet-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.sheet-title{font-size:30rpx;font-weight:800}.sheet-close{font-size:26rpx;color:#1677ff}.tip-box{padding:12rpx 16rpx;border-radius:16rpx;background:#eff6ff;margin-bottom:12rpx}.tip-main{display:block;font-size:26rpx;font-weight:700;color:#1d4ed8}.tip-sub{display:block;margin-top:6rpx;font-size:22rpx;color:#1e40af;line-height:1.5}.add-box{display:flex;gap:10rpx;flex-wrap:wrap;margin-bottom:12rpx}.add-input{flex:1;min-width:240rpx;height:72rpx;padding:0 16rpx;border:1px solid #e5e7eb;border-radius:16rpx;background:#fff}.add-btn{width:100%;height:72rpx;line-height:72rpx;border-radius:16rpx;background:#10b981;color:#fff;font-size:26rpx}.city-path{padding:12rpx 16rpx;margin-bottom:12rpx;border-radius:16rpx;background:#f8fafc;color:#334155;font-size:24rpx;line-height:1.5}.selector-wrap{height:420rpx;border:1px solid #eef2f7;border-radius:16rpx;overflow:hidden}.picker-view{height:100%}.picker-item{height:84rpx;line-height:84rpx;text-align:center;font-size:28rpx;color:#111827}.actions{display:flex;gap:12rpx;margin-top:16rpx}.btn{flex:1;border-radius:16rpx}.btn.ghost{background:#f3f4f6;color:#334155}.btn.primary{background:#1677ff;color:#fff}.btn.primary[disabled]{background:#9cc2ff;color:#fff}
</style>

View File

@@ -5,7 +5,7 @@
<text class="sheet-title">选择时间</text>
<text class="sheet-close" @tap="close">关闭</text>
</view>
<picker-view ref="picker" class="wheel" @change="onChange">
<picker-view ref="picker" class="wheel" :value="pickerValue" indicator-style="height: 88rpx;" @change="onChange">
<picker-view-column>
<view v-for="(d, i) in dateOptions" :key="d" class="wheel-item"><text>{{ d }}</text></view>
</picker-view-column>
@@ -30,31 +30,41 @@ export default {
dateOptions() { const res = []; const base = new Date(); base.setHours(0,0,0,0); for (let i = 0; i < this.days; i++) { const d = new Date(base); d.setDate(d.getDate() + i); res.push(this.formatYMD(d)) } return res },
hourOptions() { return Array.from({ length: 24 }, (_, i) => `${i < 10 ? '0' : ''}${i}`) }
},
watch: {
visible(v) { if (v) setTimeout(() => this.initValue(), 100) }
watch: {
visible(v) {
if (v) {
this.$nextTick(() => {
setTimeout(() => this.initValue(), 50)
})
}
}
},
methods: {
initValue() {
if (this.value) {
const v = String(this.value).replace('T', ' ')
const parts = v.split(' ')
const ymd = parts[0].split('-')
const hm = parts[1]?.split(':') || [0, 0]
const hour = parseInt(hm[0]) || 0
const dateIndex = this.dateOptions.indexOf(ymd.join('-'))
const ymd = (parts[0] || '').split('-')
const hm = (parts[1] || '00:00:00').split(':')
const hour = Math.max(0, Math.min(23, parseInt(hm[0], 10) || 0))
const dateKey = ymd.length === 3 ? ymd.join('-') : this.dateOptions[0]
const dateIndex = this.dateOptions.indexOf(dateKey)
this.pickerValue = [dateIndex >= 0 ? dateIndex : 0, hour]
} else {
this.pickerValue = [0, 0]
}
this.$nextTick(() => {
const pv = this.$refs.picker
if (pv) pv.setValue(this.pickerValue)
if (pv && pv.setValue) pv.setValue(this.pickerValue)
})
},
onChange(e) { this.pickerValue = e.detail.value },
onChange(e) {
const val = e.detail.value || [0, 0]
this.pickerValue = [Number(val[0]) || 0, Number(val[1]) || 0]
},
confirm() {
const date = this.dateOptions[this.pickerValue[0]] || this.dateOptions[0]
let hour = this.pickerValue[1] || 0
let hour = Number(this.pickerValue[1]) || 0
if (hour >= 24) hour = 23
this.$emit('change', `${date}T${hour < 10 ? '0' : ''}${hour}:00:00.000+08:00`)
this.close()

View File

@@ -2,151 +2,171 @@
<view v-if="visible" class="picker-mask" @tap="close">
<view class="picker-sheet" @tap.stop>
<view class="picker-header">
<text class="picker-title">选择目的地</text>
<text class="picker-title">选择城市</text>
<text class="picker-close" @tap="close">关闭</text>
</view>
<view class="city-path">{{ currentPath }}</view>
<view class="tip-box">
<text class="tip-main">仅精确到城市即可</text>
<text class="tip-sub">如果列表里没有想要的城市可以先在上方补录后再选择</text>
</view>
<picker-view class="city-wheel" :value="wheelValue" @change="onChange">
<picker-view-column>
<view class="wheel-item" v-for="item in continents" :key="item.name">
<view class="wheel-value">{{ item.name }}</view>
</view>
</picker-view-column>
<picker-view-column>
<view class="wheel-item" v-for="item in currentCountries" :key="item.name">
<view class="wheel-value">{{ item.name }}</view>
</view>
</picker-view-column>
<picker-view-column>
<view class="wheel-item" v-for="item in currentCities" :key="item.name">
<view class="wheel-value">{{ item.name }}</view>
</view>
</picker-view-column>
</picker-view>
<view class="add-box">
<input v-model="newCountryName" class="add-input" type="text" placeholder="补录国家" />
<input v-model="newCityName" class="add-input" type="text" placeholder="补录城市" />
<button class="add-btn" :loading="adding" @tap="addNewCity">补录并新增</button>
</view>
<view class="city-path">{{ currentCountry && currentCity ? (currentCountry + ' / ' + currentCity) : '请选择城市' }}</view>
<view class="selector-wrap">
<picker-view class="picker-view" :value="pickerValue" @change="onPickerChange">
<picker-view-column>
<view v-for="item in countryOptions" :key="item.name" class="picker-item">{{ item.name }}</view>
</picker-view-column>
<picker-view-column>
<view v-for="item in currentCities" :key="item.cityId || item.cityName" class="picker-item">{{ item.cityName }}</view>
</picker-view-column>
</picker-view>
</view>
<view class="picker-footer">
<button class="btn ghost" @tap="close">取消</button>
<button class="btn primary" @tap="confirm">确定</button>
<button class="btn primary" :disabled="!currentCity" @tap="confirm">确定</button>
</view>
</view>
</view>
</template>
<script>
const CITY_DATA = [
{ name: '亚洲', countries: [
{ name: '中国', cities: ['北京', '上海', '广州', '深圳', '杭州', '成都', '重庆', '西安', '南京', '武汉'] },
{ name: '日本', cities: ['东京', '大阪', '京都', '名古屋', '横滨'] },
{ name: '韩国', cities: ['首尔', '釜山', '仁川'] },
{ name: '新加坡', cities: ['新加坡'] },
{ name: '泰国', cities: ['曼谷', '清迈', '普吉'] },
{ name: '马来西亚', cities: ['吉隆坡', '槟城', '新山'] },
{ name: '印度', cities: ['新德里', '孟买', '班加罗尔'] },
{ name: '阿联酋', cities: ['迪拜', '阿布扎比'] }
]},
{ name: '欧洲', countries: [
{ name: '英国', cities: ['伦敦', '曼彻斯特', '伯明翰'] },
{ name: '法国', cities: ['巴黎', '里昂', '马赛'] },
{ name: '德国', cities: ['柏林', '慕尼黑', '法兰克福'] },
{ name: '意大利', cities: ['罗马', '米兰', '威尼斯'] },
{ name: '西班牙', cities: ['马德里', '巴塞罗那', '瓦伦西亚'] },
{ name: '荷兰', cities: ['阿姆斯特丹', '鹿特丹'] }
]},
{ name: '北美洲', countries: [
{ name: '美国', cities: ['纽约', '洛杉矶', '旧金山', '芝加哥', '西雅图'] },
{ name: '加拿大', cities: ['多伦多', '温哥华', '蒙特利尔'] },
{ name: '墨西哥', cities: ['墨西哥城', '瓜达拉哈拉'] }
]},
{ name: '南美洲', countries: [
{ name: '巴西', cities: ['圣保罗', '里约热内卢', '巴西利亚'] },
{ name: '阿根廷', cities: ['布宜诺斯艾利斯', '科尔多瓦'] },
{ name: '智利', cities: ['圣地亚哥'] }
]},
{ name: '大洋洲', countries: [
{ name: '澳大利亚', cities: ['悉尼', '墨尔本', '布里斯班', '珀斯'] },
{ name: '新西兰', cities: ['奥克兰', '惠灵顿', '基督城'] }
]},
{ name: '非洲', countries: [
{ name: '埃及', cities: ['开罗', '亚历山大'] },
{ name: '南非', cities: ['约翰内斯堡', '开普敦'] },
{ name: '肯尼亚', cities: ['内罗毕'] }
]}
]
import { listCities, addCity } from '@/api/fad/city'
export default {
props: { visible: Boolean, value: String },
emits: ['update:visible', 'change'],
data() {
return {
wheelValue: [0, 0, 0],
data: CITY_DATA
loading: false,
adding: false,
countryOptions: [],
cityMap: {},
pickerValue: [0, 0],
currentCountry: '',
currentCity: '',
newCountryName: '',
newCityName: ''
}
},
computed: {
continents() { return this.data },
currentCountries() { return this.continents[this.wheelValue[0]]?.countries || [] },
currentCities() { return this.currentCountries[this.wheelValue[1]]?.cities?.map(name => ({ name })) || [] },
currentPath() {
const c1 = this.continents[this.wheelValue[0]]?.name || ''
const c2 = this.currentCountries[this.wheelValue[1]]?.name || ''
const c3 = this.currentCities[this.wheelValue[2]]?.name || ''
return [c1, c2, c3].filter(Boolean).join(' / ') || '请选择目的地'
currentCities() {
return this.cityMap[this.currentCountry] || []
}
},
watch: {
visible(val) {
if (val) this.initFromValue()
},
wheelValue() {
this.normalize()
visible(v) {
if (v) this.initValue()
}
},
methods: {
initFromValue() {
const target = String(this.value || '')
let found = [0, 0, 0]
this.data.forEach((continent, i) => {
continent.countries.forEach((country, j) => {
country.cities.forEach((city, k) => {
const full = `${continent.name}/${country.name}/${city}`
if (target === full || target === city) found = [i, j, k]
})
async initValue() {
this.currentCountry = ''
this.currentCity = ''
this.newCountryName = ''
this.newCityName = ''
await this.loadOptions()
this.applyDefaultValue()
},
async loadOptions() {
this.loading = true
try {
const res = await listCities({ pageNum: 1, pageSize: 1000 })
const rows = res && (res.rows || (res.data && res.data.rows) || res.data || [])
const map = {}
const countries = []
rows.forEach(item => {
const country = item.countryName || ''
const city = item.cityName || ''
if (!country || !city) return
if (!map[country]) {
map[country] = []
countries.push({ name: country })
}
map[country].push(item)
})
})
this.wheelValue = found
},
normalize() {
const c = this.continents[this.wheelValue[0]]
if (!c) return
if (this.wheelValue[1] >= c.countries.length) this.wheelValue[1] = 0
const country = c.countries[this.wheelValue[1]]
if (!country) return
if (this.wheelValue[2] >= country.cities.length) this.wheelValue[2] = 0
},
onChange(e) {
this.wheelValue = (e.detail.value || []).map(v => Number(v))
},
confirm() {
const continent = this.continents[this.wheelValue[0]]
const country = this.currentCountries[this.wheelValue[1]]
const city = this.currentCities[this.wheelValue[2]]
const payload = {
continent: continent?.name || '',
country: country?.name || '',
city: city?.name || '',
label: [continent?.name, country?.name, city?.name].filter(Boolean).join(' / '),
value: [continent?.name, country?.name, city?.name].filter(Boolean).join('/')
this.countryOptions = countries
this.cityMap = map
} catch (e) {
uni.showToast({ title: e.message || '加载城市失败', icon: 'none' })
} finally {
this.loading = false
}
this.$emit('change', payload)
},
applyDefaultValue() {
const value = String(this.value || '')
for (let i = 0; i < this.countryOptions.length; i++) {
const country = this.countryOptions[i].name
const cityList = this.cityMap[country] || []
const j = cityList.findIndex(item => item.cityName === value)
if (j >= 0) {
this.pickerValue = [i, j]
this.currentCountry = country
this.currentCity = cityList[j].cityName
return
}
}
if (this.countryOptions.length) {
this.currentCountry = this.countryOptions[0].name
this.currentCity = (this.cityMap[this.currentCountry] || [])[0]?.cityName || ''
this.pickerValue = [0, 0]
}
},
close() {
this.$emit('update:visible', false)
},
close() { this.$emit('update:visible', false) }
onPickerChange(e) {
const value = (e.detail.value || []).map(v => Number(v))
const countryIndex = value[0] || 0
const country = this.countryOptions[countryIndex]?.name || ''
const cities = this.cityMap[country] || []
const cityIndex = Math.min(value[1] || 0, Math.max(cities.length - 1, 0))
this.pickerValue = [countryIndex, cityIndex]
this.currentCountry = country
this.currentCity = cities[cityIndex]?.cityName || ''
},
async addNewCity() {
const countryName = String(this.newCountryName || '').trim()
const cityName = String(this.newCityName || '').trim()
if (!countryName || !cityName) {
uni.showToast({ title: '请填写国家和城市', icon: 'none' })
return
}
this.adding = true
try {
await addCity({ countryName, cityName, status: 1, remark: '补录城市' })
uni.showToast({ title: '补录成功', icon: 'success' })
this.newCountryName = ''
this.newCityName = ''
await this.loadOptions()
this.currentCountry = countryName
this.currentCity = cityName
const countryIndex = this.countryOptions.findIndex(item => item.name === countryName)
const cityIndex = (this.cityMap[countryName] || []).findIndex(item => item.cityName === cityName)
this.pickerValue = [Math.max(countryIndex, 0), Math.max(cityIndex, 0)]
} catch (e) {
uni.showToast({ title: e.message || '补录失败', icon: 'none' })
} finally {
this.adding = false
}
},
confirm() {
if (!this.currentCity) return
this.$emit('change', this.currentCity)
this.close()
}
}
}
</script>
<style scoped>
.picker-mask{position:fixed;inset:0;background:rgba(15,23,42,.45);z-index:1000;display:flex;align-items:flex-end}.picker-sheet{width:100%;background:#fff;border-radius:24rpx 24rpx 0 0;padding:20rpx;box-sizing:border-box}.picker-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.picker-title{font-size:30rpx;font-weight:800;color:#111827}.picker-close{font-size:26rpx;color:#1677ff}.city-path{padding:12rpx 16rpx;margin-bottom:12rpx;border-radius:16rpx;background:#f8fafc;color:#334155;font-size:24rpx}.city-wheel{height:520rpx;display:flex}.wheel-item{display:flex;align-items:center;justify-content:center;height:88rpx}.wheel-value{font-size:28rpx;font-weight:600;color:#111827}.picker-footer{display:flex;gap:12rpx;margin-top:16rpx}.btn{flex:1;border-radius:16rpx}.btn.ghost{background:#f3f4f6;color:#334155}.btn.primary{background:linear-gradient(135deg,#1677ff,#4f9dff);color:#fff}
</style>
.picker-mask{position:fixed;inset:0;background:rgba(15,23,42,.45);z-index:1000;display:flex;align-items:flex-end}.picker-sheet{width:100%;background:#fff;border-radius:24rpx 24rpx 0 0;padding:20rpx;box-sizing:border-box}.picker-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.picker-title{font-size:30rpx;font-weight:800;color:#111827}.picker-close{font-size:26rpx;color:#1677ff}.tip-box{padding:12rpx 16rpx;border-radius:16rpx;background:#eff6ff;margin-bottom:12rpx}.tip-main{display:block;font-size:26rpx;font-weight:700;color:#1d4ed8}.tip-sub{display:block;margin-top:6rpx;font-size:22rpx;color:#1e40af;line-height:1.5}.add-box{display:flex;gap:10rpx;flex-wrap:wrap;margin-bottom:12rpx}.add-input{flex:1;min-width:240rpx;height:72rpx;padding:0 16rpx;border:1px solid #e5e7eb;border-radius:16rpx;background:#fff}.add-btn{width:100%;height:72rpx;line-height:72rpx;border-radius:16rpx;background:#10b981;color:#fff;font-size:26rpx}.city-path{padding:12rpx 16rpx;margin-bottom:12rpx;border-radius:16rpx;background:#f8fafc;color:#334155;font-size:24rpx;line-height:1.5}.selector-wrap{height:420rpx;border:1px solid #eef2f7;border-radius:16rpx;overflow:hidden}.picker-view{height:100%}.picker-item{height:84rpx;line-height:84rpx;text-align:center;font-size:28rpx;color:#111827}.picker-footer{display:flex;gap:12rpx;margin-top:16rpx}.btn{flex:1;border-radius:16rpx}.btn.ghost{background:#f3f4f6;color:#334155}.btn.primary{background:linear-gradient(135deg,#1677ff,#4f9dff);color:#fff}.btn.primary[disabled]{background:#9cc2ff;color:#fff}
</style>

View File

@@ -1,40 +1,167 @@
<template>
<view class="page">
<scroll-view class="scroll" scroll-y>
<view class="card" v-for="section in sections" :key="section.key">
<view class="scroll">
<view
v-for="section in sections"
:key="section.key"
class="card"
>
<view class="card-title">{{ section.title }}</view>
<view v-for="field in section.fields" :key="field.key" class="field">
<text class="label">{{ field.label }}<text v-if="field.required" class="req">*</text></text>
<template v-if="field.type === 'select'"><picker mode="selector" :range="field.options" @change="e => onSelect(field.key, field.options, e)"><view class="input-like clickable">{{ form[field.key] || field.placeholder }}</view></picker></template>
<template v-else-if="field.type === 'datetime'"><view class="input-like clickable" @tap="openDateTime(field.key)">{{ formatDateTime(field.key) || field.placeholder }}</view></template>
<template v-else-if="field.type === 'city'"><view class="input-like clickable" @tap="openCity(field.key)">{{ form[field.key] || field.placeholder }}</view></template>
<template v-else-if="field.type === 'computed'"><view class="computed-box">{{ computedFieldText(field.key) || field.placeholder || '' }}</view></template>
<view
v-for="field in section.fields"
:key="field.key"
class="field"
>
<text class="label">
{{ field.label }}
<text v-if="field.required" class="req">*</text>
</text>
<template v-if="field.type === 'select'">
<picker
mode="selector"
:range="field.options"
@change="onSelect(field, $event)"
>
<view class="input-like clickable">
{{ getFieldDisplayValue(field) }}
</view>
</picker>
</template>
<template v-else-if="field.type === 'datetime'">
<view class="input-like clickable" @tap="openDateTime(field.key)">
{{ getFieldDisplayValue(field) }}
</view>
</template>
<template v-else-if="field.type === 'city'">
<view class="input-like clickable" @tap="openCity(field.key)">
{{ getFieldDisplayValue(field) || field.placeholder || '选择城市' }}
</view>
</template>
<template v-else-if="field.type === 'computed'">
<view class="computed-box">
{{ getFieldDisplayValue(field) }}
</view>
</template>
<template v-else-if="field.type === 'file'">
<view class="file-picker-wrap">
<view class="upload-box clickable" @tap="openFilePicker(field.key)">
<view class="upload-box clickable" :class="{ disabled: uploadingFieldKey === field.key }" @tap="openFilePicker(field.key)">
<view class="upload-hint">{{ field.placeholder || '点击上传文件' }}</view>
<view class="upload-sub">支持文件上传点击后选择文件</view>
<view class="upload-sub">{{ uploadingFieldKey === field.key ? '上传中,请稍候...' : (field.uploadTip || '支持文件上传点击后选择文件') }}</view>
</view>
<view class="file-list" v-if="fileFields[field.key] && fileFields[field.key].length">
<view class="file-item" v-for="(file, idx) in fileFields[field.key]" :key="file.ossId || file.url || idx">
<view v-if="field.accept" class="upload-rule">
仅支持 {{ field.accept }} 格式文件
</view>
<view v-if="uploadingFieldKey === field.key" class="upload-loading">
<text class="loading-dot"></text>
<text class="loading-text">文件正在上传中...</text>
</view>
<view
v-if="getFileList(field.key).length"
class="file-list"
>
<view
v-for="(file, idx) in getFileList(field.key)"
:key="file.ossId || file.url || idx"
class="file-item"
>
<text class="file-name">{{ file.originalName || file.fileName || file.url }}</text>
<text class="remove" @tap="removeFile(field.key, idx)">删除</text>
</view>
</view>
</view>
</template>
<template v-else-if="field.type === 'textarea'"><textarea class="textarea" v-model="form[field.key]" :maxlength="field.maxlength || 200" :placeholder="field.placeholder" /></template>
<template v-else><input class="input" :type="field.inputType || 'text'" v-model="form[field.key]" :placeholder="field.placeholder" /></template>
<template v-else-if="field.type === 'textarea'">
<textarea
v-model="form[field.key]"
class="textarea"
:maxlength="field.maxlength || 200"
:placeholder="field.placeholder"
/>
</template>
<template v-else-if="field.type === 'input' || field.type === 'number' || field.type === 'text' || !field.type">
<view class="text-input-wrap">
<input
v-model="form[field.key]"
class="input"
:type="normalizeInputType(field.inputType)"
:placeholder="field.placeholder"
:confirm-type="field.confirmType || 'done'"
:adjust-position="true"
@focus="onInputFocus(field.key)"
/>
</view>
</template>
<template v-else>
<input
:value="form[field.key]"
class="input"
type="text"
:placeholder="field.placeholder"
:confirm-type="field.confirmType || 'done'"
:adjust-position="true"
@input="onInput(field.key, $event)"
@focus="onInputFocus(field.key)"
/>
</template>
</view>
</view>
<view class="card"><view class="card-title">审批方式</view><view class="field"><text class="label">审批人<text class="req">*</text></text><view class="input-like clickable" @tap="openEmployeePicker('assignee')">{{ assigneeLabel || '点击选择审批人' }}</view></view></view>
<view class="card"><view class="card-title">抄送</view><view class="field"><text class="label">抄送人</text><view class="input-like clickable" @tap="openEmployeePicker('cc')">{{ ccUsers.length ? `已选择 ${ccUsers.length} ` : '点击选择抄送人' }}</view></view></view>
<view class="card"><view class="card-title">提交</view><button class="btn primary" :loading="submitting" @tap="submit">提交申请</button></view>
</scroll-view>
<view class="card">
<view class="card-title">审批方式</view>
<view class="field">
<text class="label">审批人<text class="req">*</text></text>
<view class="input-like clickable" @tap="openEmployeePicker('assignee')">
{{ assigneeLabel || '点击选择审批人' }}
</view>
</view>
</view>
<view class="card">
<view class="card-title">抄送</view>
<view class="field">
<text class="label">抄送人</text>
<view class="input-like clickable" @tap="openEmployeePicker('cc')">
{{ ccLabel }}
</view>
</view>
</view>
<view class="card">
<view class="card-title">提交</view>
<button class="btn primary" :loading="submitting" @tap="submit">提交申请</button>
</view>
</view>
<x-file-picker ref="globalFilePicker" @select="onGlobalFileSelect" />
<employee-picker :visible.sync="employeeSheetVisible" :title="employeeMode === 'assignee' ? '选择审批人' : '选择抄送人'" :list="employees" :multiple="employeeMode === 'cc'" :value="employeeMode === 'assignee' ? assignee : ccUsers" @change="onEmployeeChange" />
<date-time-picker :visible.sync="dateTimeSheetVisible" :value="form[datetimeFieldKey]" @change="onDateTimeChange" />
<city-picker :visible.sync="citySheetVisible" :value="form[cityFieldKey]" @change="onCityChange" />
<employee-picker
:visible.sync="employeeSheetVisible"
:title="employeeMode === 'assignee' ? '选择审批人' : '选择抄送人'"
:list="employees"
:multiple="employeeMode === 'cc'"
:value="employeeMode === 'assignee' ? assignee : ccUsers"
@change="onEmployeeChange"
/>
<date-time-picker
:visible.sync="dateTimeSheetVisible"
:value="form[datetimeFieldKey]"
@change="onDateTimeChange"
/>
<city-picker
:visible.sync="citySheetVisible"
:value="form[cityFieldKey]"
@change="onCityChange"
/>
</view>
</template>
@@ -50,117 +177,328 @@ import XFilePicker from '@/components/x-native-uploader/x-file-picker.vue'
export default {
components: { EmployeePicker, DateTimePicker, CityPicker, XFilePicker },
props: { title: String, subtitle: String, bizType: String, requestApi: Function, initialForm: Object, sections: Array, flowFields: { type: Array, default: () => [] } },
data() { return { submitting: false, form: JSON.parse(JSON.stringify(this.initialForm || {})), employees: [], employeeSheetVisible: false, employeeMode: 'assignee', assignee: null, ccUsers: [], cachedAssigneeKey: '', dateTimeSheetVisible: false, datetimeFieldKey: '', citySheetVisible: false, cityFieldKey: '', imageFields: {}, fileFields: {}, currentEmpId: null } },
computed: { assigneeLabel() { return this.assignee ? this.employeeName(this.assignee) : '' } },
async created() {
this.cachedAssigneeKey = `hrm_manual_assignee_${this.bizType || 'default'}`;
await this.loadEmployees();
await this.loadCurrentEmpId()
this.restoreAssignee()
props: {
title: String,
subtitle: String,
bizType: String,
requestApi: Function,
initialForm: Object,
sections: Array,
flowFields: { type: Array, default: () => [] }
},
watch: {
'form.startTime'(val) { this.autoFillHours() },
'form.endTime'(val) { this.autoFillHours() }
data() {
return {
submitting: false,
form: JSON.parse(JSON.stringify(this.initialForm || {})),
employees: [],
employeeSheetVisible: false,
employeeMode: 'assignee',
assignee: null,
ccUsers: [],
cachedAssigneeKey: '',
dateTimeSheetVisible: false,
datetimeFieldKey: '',
citySheetVisible: false,
cityFieldKey: '',
fileFields: {},
currentFileFieldKey: '',
currentFileFieldConfig: null,
uploadingFieldKey: '',
currentInputFieldKey: '',
currentEmpId: null
}
},
computed: {
assigneeLabel() {
return this.assignee ? this.employeeName(this.assignee) : ''
},
ccLabel() {
return this.ccUsers.length ? '已选择 ' + this.ccUsers.length + ' 人' : '点击选择抄送人'
}
},
async created() {
this.cachedAssigneeKey = 'hrm_manual_assignee_' + (this.bizType || 'default')
await this.loadEmployees()
await this.loadCurrentEmpId()
this.restoreAssignee()
},
watch: {
'form.startTime'() {
this.autoFillHours()
},
'form.endTime'() {
this.autoFillHours()
}
},
methods: {
onSelect(fieldKey, options, e) {
const idx = Number(e.detail.value)
this.$set(this.form, fieldKey, options[idx])
getFieldValue(fieldKey) {
return this.form[fieldKey]
},
getFieldDisplayValue(field) {
if (field.type === 'datetime') return this.formatDateTime(field.key) || field.placeholder || ''
if (field.type === 'computed') return this.computedFieldText(field.key) || field.placeholder || '—'
var value = this.getFieldValue(field.key)
return value !== undefined && value !== null && value !== '' ? value : (field.placeholder || '')
},
getFileList(fieldKey) {
return this.fileFields[fieldKey] || []
},
normalizeInputType(inputType) {
return inputType || 'text'
},
onInputFocus(fieldKey) {
this.currentInputFieldKey = fieldKey
},
onInput(fieldKey, e) {
var value = e && e.detail ? e.detail.value : e
this.$set(this.form, fieldKey, value)
},
onSelect(field, e) {
var idx = Number(e.detail.value)
var options = field.options || []
this.$set(this.form, field.key, options[idx])
},
employeeName(emp) {
return emp && (emp.empName || emp.nickName || emp.userName || emp.realName) || ('员工' + ((emp && (emp.userId || emp.id)) || ''))
},
employeeDept(emp) {
return (emp && emp.dept && emp.dept.deptName) || (emp && emp.deptName) || '未分配部门'
},
async loadEmployees() {
try {
var res = await listUser({ pageNum: 1, pageSize: 500 })
this.employees = res.rows || res.data || []
} catch (e) {
this.employees = []
}
},
async loadCurrentEmpId() {
try {
var oaId = uni.getStorageSync('oaId')
if (!oaId) return
var emp = await getEmployeeByUserId(oaId)
if (emp && emp.data && emp.data.empId) {
this.currentEmpId = emp.data.empId
}
} catch (e) {
console.log('[loadCurrentEmpId] error', e)
}
},
restoreAssignee() {
try {
var raw = uni.getStorageSync(this.cachedAssigneeKey)
if (!raw) return
var cached = typeof raw === 'string' ? JSON.parse(raw) : raw
var id = String(cached.userId || cached.empId || '')
var hit = this.employees.find(function (e) {
return String(e.userId || e.id) === id
})
if (hit) this.assignee = hit
} catch (e) {}
},
openEmployeePicker(mode) {
this.employeeMode = mode
this.employeeSheetVisible = true
},
onEmployeeChange(val) {
if (this.employeeMode === 'assignee') {
this.assignee = val
try {
uni.setStorageSync(this.cachedAssigneeKey, JSON.stringify({
userId: val && (val.userId || val.id),
empId: val && val.empId || '',
empName: this.employeeName(val),
deptName: this.employeeDept(val)
}))
} catch (e) {}
} else {
this.ccUsers = val || []
}
},
employeeName(emp) { return emp?.empName || emp?.nickName || emp?.userName || emp?.realName || `员工${emp?.userId || emp?.id || ''}` },
employeeDept(emp) { return emp?.dept?.deptName || emp?.deptName || '未分配部门' },
async loadEmployees() { try { const res = await listUser({ pageNum: 1, pageSize: 500 }); this.employees = res.rows || res.data || [] } catch (e) { this.employees = [] } },
async loadCurrentEmpId() { try { const oaId = uni.getStorageSync('oaId'); if (!oaId) return; const emp = await getEmployeeByUserId(oaId); if (emp?.data?.empId) this.currentEmpId = emp.data.empId } catch (e) { console.log('[loadCurrentEmpId] error', e) } },
restoreAssignee() { try { const raw = uni.getStorageSync(this.cachedAssigneeKey); if (!raw) return; const cached = typeof raw === 'string' ? JSON.parse(raw) : raw; const id = String(cached.userId || cached.empId || ''); const hit = this.employees.find(e => String(e.userId || e.id) === id); if (hit) this.assignee = hit } catch (e) {} },
openEmployeePicker(mode) { this.employeeMode = mode; this.employeeSheetVisible = true },
onEmployeeChange(val) { if (this.employeeMode === 'assignee') { this.assignee = val; try { uni.setStorageSync(this.cachedAssigneeKey, JSON.stringify({ userId: val.userId || val.id, empId: val.empId || '', empName: this.employeeName(val), deptName: this.employeeDept(val) })) } catch (e) {} } else { this.ccUsers = val || [] } },
openFilePicker(fieldKey) {
this.currentFileFieldKey = fieldKey
console.log('[RequestForm] openFilePicker', fieldKey, this.$refs.globalFilePicker)
const picker = this.$refs.globalFilePicker
this.currentFileFieldConfig = this.flowFields.find(function (f) { return f.key === fieldKey }) || null
var picker = this.$refs.globalFilePicker
if (picker && picker.open) {
picker.open()
} else {
console.warn('[RequestForm] file picker ref missing or open() unavailable,', fieldKey, picker)
console.warn('[RequestForm] file picker ref missing or open() unavailable', fieldKey)
}
},
async onGlobalFileSelect(payload) {
const fieldKey = this.currentFileFieldKey
console.log('[RequestForm] file select', fieldKey, payload)
var fieldKey = this.currentFileFieldKey
if (!fieldKey) return
const files = Array.isArray(payload) ? payload : [payload]
var files = Array.isArray(payload) ? payload : [payload]
if (!this.fileFields[fieldKey]) this.$set(this.fileFields, fieldKey, [])
for (const f of files.filter(Boolean)) {
try {
const uploaded = await uploadFile({
path: f.path || f.url || '',
name: f.name || f.fileName || 'file',
size: f.size || 0,
type: f.type || ''
})
this.fileFields[fieldKey].push({
name: uploaded.fileName || f.name || f.fileName || 'file',
extname: (f.name || f.fileName || '').split('.').pop() || '',
url: uploaded.url || f.path || f.url || '',
ossId: uploaded.ossId || uploaded.url || f.path || f.url || '',
fileName: uploaded.fileName || f.fileName || f.name || '',
originalName: f.name || f.fileName || uploaded.fileName || ''
})
} catch (e) {
uni.showToast({ title: e.message || '上传失败', icon: 'none' })
var cfg = this.currentFileFieldConfig || {}
var allowedExt = (cfg.accept || '').toLowerCase().split(',').map(function (x) { return x.trim() }).filter(Boolean)
if (cfg.key === 'applyFileIds' && this.bizType === 'seal' && allowedExt.indexOf('.pdf') === -1) {
allowedExt = ['.pdf']
}
this.uploadingFieldKey = fieldKey
uni.showLoading({ title: '上传中...' })
try {
for (var i = 0; i < files.length; i++) {
var f = files[i]
if (!f) continue
var name = String(f.name || f.fileName || '').toLowerCase()
var ext = name.indexOf('.') >= 0 ? '.' + name.split('.').pop() : ''
if (allowedExt.length && allowedExt.indexOf(ext) === -1) {
uni.showToast({ title: '仅支持上传 PDF 文件', icon: 'none' })
continue
}
try {
var uploaded = await uploadFile({
path: f.path || f.url || '',
name: f.name || f.fileName || 'file',
size: f.size || 0,
type: f.type || ''
})
this.fileFields[fieldKey].push({
name: uploaded.fileName || f.name || f.fileName || 'file',
extname: ext.replace('.', '') || (f.name || f.fileName || '').split('.').pop() || '',
url: uploaded.url || f.path || f.url || '',
ossId: uploaded.ossId || uploaded.url || f.path || f.url || '',
fileName: uploaded.fileName || f.fileName || f.name || '',
originalName: f.name || f.fileName || uploaded.fileName || ''
})
} catch (e) {
uni.showToast({ title: e.message || '上传失败', icon: 'none' })
}
}
this.syncFileIds(fieldKey)
} finally {
uni.hideLoading()
this.uploadingFieldKey = ''
this.currentFileFieldKey = ''
this.currentFileFieldConfig = null
}
},
removeFile(fieldKey, idx) {
var arr = (this.fileFields[fieldKey] || []).slice()
arr.splice(idx, 1)
this.$set(this.fileFields, fieldKey, arr)
this.syncFileIds(fieldKey)
},
syncFileIds(fieldKey) {
var arr = this.fileFields[fieldKey] || []
this.$set(this.form, fieldKey, arr.map(function (x) { return x.ossId }).join(','))
},
openDateTime(fieldKey) {
this.datetimeFieldKey = fieldKey
this.dateTimeSheetVisible = true
},
formatDateTime(key) {
var v = this.form[key]
if (!v) return ''
return String(v).replace('T', ' ').substring(0, 16)
},
onDateTimeChange(val) {
if (!this.datetimeFieldKey) return
this.$set(this.form, this.datetimeFieldKey, val)
this.autoFillHours()
},
computedFieldText(key) {
if (key === 'hours') {
var val = this.form[key]
return val ? val + ' 小时' : ''
}
var value = this.form[key]
return value !== undefined && value !== null ? value : ''
},
openCity(fieldKey) {
this.cityFieldKey = fieldKey
this.citySheetVisible = true
},
onCityChange(val) {
if (!this.cityFieldKey) return
this.$set(this.form, this.cityFieldKey, val)
},
autoFillHours() {
var s = this.parseDT(this.form.startTime)
var e = this.parseDT(this.form.endTime)
if (!s || !e) return
var ms = e.getTime() - s.getTime()
if (ms <= 0) return
var hours = (Math.round((ms / 3600000) * 2) / 2).toFixed(1).replace(/\.0$/, '')
this.$set(this.form, 'hours', hours)
},
parseDT(v) {
if (!v) return null
var d = new Date(String(v).replace('T', ' ').replace(/-/g, '/'))
return Number.isNaN(d.getTime()) ? null : d
},
validateFlowFields() {
for (var i = 0; i < this.flowFields.length; i++) {
var f = this.flowFields[i]
if (f.required && !this.form[f.key]) {
uni.showToast({ title: '请填写' + f.label, icon: 'none' })
return false
}
}
this.$set(this.form, fieldKey, this.fileFields[fieldKey].map(x => x.ossId).join(','))
this.currentFileFieldKey = ''
if (!this.assignee) {
uni.showToast({ title: '请选择审批人', icon: 'none' })
return false
}
return true
},
removeFile(fieldKey, idx) { const arr = (this.fileFields[fieldKey] || []).slice(); arr.splice(idx, 1); this.$set(this.fileFields, fieldKey, arr); this.$set(this.form, fieldKey, arr.map(x => x.ossId).join(',')) },
openDateTime(fieldKey) { this.datetimeFieldKey = fieldKey; this.dateTimeSheetVisible = true },
formatDateTime(key) { const v = this.form[key]; if (!v) return ''; return v.replace('T', ' ').substring(0, 16) },
onDateTimeChange(val) { if (!this.datetimeFieldKey) return; this.$set(this.form, this.datetimeFieldKey, val); this.autoFillHours() },
computedFieldText(key) { if (key === 'hours') { const val = this.form[key]; return val ? `${val} 小时` : '' } return this.form[key] || '' },
openCity(fieldKey) { this.cityFieldKey = fieldKey; this.citySheetVisible = true },
onCityChange(val) { if (!this.cityFieldKey) return; this.$set(this.form, this.cityFieldKey, val) },
onFileSelect(fieldKey) { if (!this.fileFields[fieldKey]) this.$set(this.fileFields, fieldKey, []) },
onFileSuccess(fieldKey, e) {
if (!this.fileFields[fieldKey]) this.$set(this.fileFields, fieldKey, [])
const files = e?.tempFiles || []
const current = Array.isArray(this.fileFields[fieldKey]) ? this.fileFields[fieldKey] : []
this.fileFields[fieldKey] = [...current, ...files.map(f => ({
name: f.name || f.fileName || 'file',
extname: (f.name || f.fileName || '').split('.').pop() || '',
url: f.url || f.tempFilePath || f.path || '',
ossId: f.ossId || f.fileID || f.url || '',
fileName: f.fileName || f.name || '',
originalName: f.originalName || f.name || f.fileName || ''
}))]
this.$set(this.form, fieldKey, this.fileFields[fieldKey].map(x => x.ossId).join(','))
submit() {
this.autoFillHours()
if (!this.validateFlowFields()) return
this.doSubmit()
},
onFileDelete(fieldKey, e) {
const fileList = Array.isArray(this.fileFields[fieldKey]) ? this.fileFields[fieldKey] : []
const index = e?.index ?? e?.indexs?.[0] ?? -1
if (index >= 0) fileList.splice(index, 1)
this.$set(this.fileFields, fieldKey, [...fileList])
this.$set(this.form, fieldKey, fileList.map(x => x.ossId).join(','))
buildSubmitPayload() {
return {
...this.form,
status: 'pending',
bizType: this.bizType,
manualAssigneeUserId: this.assignee.userId || this.assignee.id,
tplId: this.form.tplId || null,
empId: this.currentEmpId
}
},
pickImages() {},
async doSubmit() {
this.submitting = true
try {
var payload = this.buildSubmitPayload()
console.log('[RequestForm] submit payload', payload)
var res = await this.requestApi(payload)
var inst = res && (res.data || res)
if (!inst || (!inst.instId && !inst.bizId)) {
console.warn('[RequestForm] submit success but no flow instance returned', res)
}
autoFillHours() {
const s = this.parseDT(this.form.startTime), e = this.parseDT(this.form.endTime)
if (!s || !e) return;
const ms = e.getTime() - s.getTime();
if (ms <= 0) return;
const hours = (Math.round((ms / 3600000) * 2) / 2).toFixed(1).replace(/\.0$/, '');
this.$set(this.form, 'hours', hours)
},
parseDT(v) { if (!v) return null; const d = new Date(String(v).replace('T', ' ').replace(/-/g, '/')); return Number.isNaN(d.getTime()) ? null : d },
submit() { this.autoFillHours(); for (const f of this.flowFields) if (f.required && !this.form[f.key]) return uni.showToast({ title: `请填写${f.label}`, icon: 'none' }); if (!this.assignee) return uni.showToast({ title: '请选择审批人', icon: 'none' }); this.doSubmit() },
async doSubmit() { this.submitting = true; try { const payload = { ...this.form, status: 'pending', empId: this.currentEmpId, manualAssigneeUserId: this.assignee.userId || this.assignee.id }; const res = await this.requestApi(payload); const inst = res?.data || res; if (this.ccUsers.length && inst?.instId) await ccFlowTask({ instId: inst.instId, bizId: inst.bizId, bizType: this.bizType, ccUserIds: this.ccUsers.map(u => u.userId || u.id), remark: '手机端抄送', fromUserId: this.$store?.state?.user?.id || '', nodeId: 0, nodeName: '节点#0', readFlag: 0 }); uni.showToast({ title: '提交成功', icon: 'success' }); setTimeout(() => uni.navigateBack({ delta: 1 }), 500) } catch (e) { uni.showToast({ title: e.message || '提交失败', icon: 'none' }) } finally { this.submitting = false } }
if (this.ccUsers.length && inst && inst.instId) {
await ccFlowTask({
instId: inst.instId,
bizId: inst.bizId,
bizType: this.bizType,
ccUserIds: this.ccUsers.map(function (u) { return u.userId || u.id }),
remark: '手机端抄送',
fromUserId: (this.$store && this.$store.state && this.$store.state.user && this.$store.state.user.id) || '',
nodeId: 0,
nodeName: '节点#0',
readFlag: 0
})
}
uni.showToast({ title: '提交成功', icon: 'success' })
setTimeout(function () {
uni.navigateBack({ delta: 1 })
}, 500)
} catch (e) {
uni.showToast({ title: e.message || '提交失败', icon: 'none' })
} finally {
this.submitting = false
}
}
}
}
</script>
<style scoped>
.page{min-height:100vh;background:#f5f7fb}.scroll{height:100vh;padding:24rpx;box-sizing:border-box}.card{background:#fff;border-radius:20rpx;padding:24rpx;margin-bottom:20rpx}.card-title{font-size:30rpx;font-weight:700;color:#111827;margin-bottom:16rpx}.field{margin-bottom:18rpx}.label{display:block;margin-bottom:8rpx;font-size:24rpx;color:#6b7280}.req{color:#ef4444;margin-left:4rpx}.input-like,.input,.textarea{width:100%;box-sizing:border-box;border:1rpx solid #e5e7eb;border-radius:16rpx;background:#f9fafb;padding:20rpx;font-size:28rpx;color:#111827}.clickable{color:#111827}.textarea{min-height:160rpx}.computed-box{width:100%;box-sizing:border-box;padding:18rpx 20rpx;border-radius:16rpx;background:#eef6ff;color:#6b8fd6;font-size:26rpx;font-weight:500;line-height:1.5}.upload-box{border:1rpx dashed #cbd5e1;border-radius:18rpx;background:linear-gradient(180deg,#fbfdff 0%,#f4f8ff 100%);padding:24rpx 22rpx;box-shadow:0 8rpx 24rpx rgba(22,119,255,.06);}.upload-hint{font-size:28rpx;color:#111827;font-weight:700}.upload-sub{margin-top:8rpx;font-size:22rpx;color:#94a3b8;line-height:1.5}.file-list{margin-top:16rpx;display:flex;flex-direction:column;gap:12rpx}.file-item{display:flex;align-items:center;justify-content:space-between;padding:18rpx 18rpx;border-radius:16rpx;background:#f8fafc;border:1rpx solid #e5eefc}.file-name{flex:1;font-size:26rpx;color:#334155;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:16rpx}.remove{font-size:24rpx;color:#ef4444;flex-shrink:0}.btn.primary{width:100%;background:#1677ff;color:#fff;border-radius:16rpx}
</style>
.page{min-height:100vh;background:#f5f7fb}.scroll{height:100vh;padding:24rpx;box-sizing:border-box}.card{background:#fff;border-radius:20rpx;padding:24rpx;margin-bottom:20rpx}.card-title{font-size:30rpx;font-weight:700;color:#111827;margin-bottom:16rpx}.field{margin-bottom:18rpx}.label{display:block;margin-bottom:8rpx;font-size:24rpx;color:#6b7280}.req{color:#ef4444;margin-left:4rpx}.input-like,.input,.textarea{width:100%;box-sizing:border-box;border:1rpx solid #e5e7eb;border-radius:16rpx;background:#f9fafb;padding:20rpx;font-size:28rpx;color:#111827}.text-input-wrap{position:relative;z-index:20;background:transparent;pointer-events:auto}.text-input-wrap .input{position:relative;z-index:21;pointer-events:auto;touch-action:manipulation}.clickable{color:#111827}.textarea{min-height:160rpx}.computed-box{width:100%;box-sizing:border-box;padding:18rpx 20rpx;border-radius:16rpx;background:#eef6ff;color:#6b8fd6;font-size:26rpx;font-weight:500;line-height:1.5}.upload-box{position:relative;z-index:1;border:1rpx dashed #cbd5e1;border-radius:18rpx;background:linear-gradient(180deg,#fbfdff 0%,#f4f8ff 100%);padding:24rpx 22rpx;box-shadow:0 8rpx 24rpx rgba(22,119,255,.06);pointer-events:auto}.upload-hint{font-size:28rpx;color:#111827;font-weight:700}.upload-sub{margin-top:8rpx;font-size:22rpx;color:#94a3b8;line-height:1.5}.upload-rule{margin-top:8rpx;font-size:22rpx;color:#f59e0b;line-height:1.5}.upload-loading{margin-top:12rpx;display:flex;align-items:center;gap:12rpx;padding:16rpx 18rpx;border-radius:16rpx;background:#f0f7ff;color:#1677ff;font-size:24rpx;font-weight:500}.loading-dot{width:16rpx;height:16rpx;border-radius:50%;background:#1677ff;box-shadow:0 0 0 0 rgba(22,119,255,.45);animation:uploadPulse 1.2s infinite}.loading-text{flex:1}.file-list{margin-top:16rpx;display:flex;flex-direction:column;gap:12rpx}.file-item{display:flex;align-items:center;justify-content:space-between;padding:18rpx 18rpx;border-radius:16rpx;background:#f8fafc;border:1rpx solid #e5eefc}.file-name{flex:1;font-size:26rpx;color:#334155;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:16rpx}.remove{font-size:24rpx;color:#ef4444;flex-shrink:0}.btn.primary{width:100%;background:#1677ff;color:#fff;border-radius:16rpx}@keyframes uploadPulse{0%{transform:scale(.85);opacity:.7}50%{transform:scale(1);opacity:1}100%{transform:scale(.85);opacity:.7}}
</style>

View File

@@ -1,81 +1,84 @@
<template>
<!-- 出差申请详情容器复用统一卡片样式 -->
<view class="reimburse-detail-container">
<!-- 出差类型 - 带分类图标 -->
<view class="leave-detail-container">
<view class="detail-item single-item">
<text class="item-icon icon-travel-type"></text>
<view class="item-label">拨款类型</view>
<view class="item-label">拨款类型</view>
<view class="item-value">{{ detail.appropriationType || '无' }}</view>
</view>
<!-- 预估费用 - 突出显示带金额图标+主题色+加粗财务核心字段 -->
<view class="detail-item single-item amount-item">
<text class="item-icon icon-amount"></text>
<view class="item-label">拨款总金额</view>
<view class="item-label">拨款总金额</view>
<view class="item-value">{{ detail.amount || 0 }} </view>
</view>
<!-- 收款人姓名 - 带用户图标 -->
<view class="detail-item single-item">
<text class="item-icon icon-user"></text>
<view class="item-label">收款人姓名</view>
<view class="item-label">收款人姓名</view>
<view class="item-value">{{ detail.payeeName || '无' }}</view>
</view>
<!-- 开户银行 - 带银行专属图标贴合财务场景 -->
<view class="detail-item single-item">
<text class="item-icon icon-bank"></text>
<view class="item-label">开户银行</view>
<view class="item-label">开户银行</view>
<view class="item-value">{{ detail.bankName || '无' }}</view>
</view>
<!-- 银行账号 - 带卡号专属图标 -->
<view class="detail-item single-item">
<text class="item-icon icon-card"></text>
<view class="item-label">银行账号</view>
<view class="item-label">银行账号</view>
<view class="item-value">{{ detail.bankAccount || '无' }}</view>
</view>
<!-- 备注 - 带笔记图标多行文适配 -->
<view class="detail-item single-item multi-line">
<text class="item-icon icon-remark"></text>
<view class="item-label">拨款事由</view>
<view class="item-label">拨款事由</view>
<view class="item-value">{{ detail.reason || '无' }}</view>
</view>
<!-- 备注 - 带笔记图标多行文适配 -->
<view class="detail-item single-item multi-line">
<text class="item-icon icon-remark"></text>
<view class="item-label">备注</view>
<view class="item-label">备注</view>
<view class="item-value">{{ detail.remark || '无' }}</view>
</view>
<!-- 创建人 - 带创建用户图标 -->
<view class="detail-item single-item">
<text class="item-icon icon-creator"></text>
<view class="item-label">申请人</view>
<view class="item-label">申请人</view>
<view class="item-value">{{ detail.createBy || '无' }}</view>
</view>
<view class="detail-item single-item">
<text class="item-icon icon-creator"></text>
<view class="item-label">申请时间</view>
<view class="item-value">{{ detail.createTime || '无' }}</view>
<text class="item-icon icon-date"></text>
<view class="item-label">申请时间</view>
<view class="item-value">{{ formatTime(detail.createTime) || '无' }}</view>
</view>
<view class="detail-item single-item">
<text class="item-icon icon-date"></text>
<view class="item-label">附件</view>
<view class="item-value">
<text class="item-icon icon-date"></text>
<view class="item-label">附件</view>
<view class="item-value">
<view v-if="uploading" class="upload-loading">
<text class="loading-dot"></text>
<text class="loading-text">附件正在上传中...</text>
</view>
<oa-file-list :files="detail.accessoryApplyIds"></oa-file-list>
</view>
</view>
<view class="detail-item single-item amount-item" @click="openPopup" v-if="detail.projectId">
<view class="detail-item single-item amount-item" v-if="detail.projectId" @click="openPopup">
<text class="item-icon icon-creator"></text>
<view class="item-label">项目名称</view>
<view class="item-label">项目名称</view>
<view class="item-value">{{ detail.projectName || '无' }}</view>
</view>
<view class="detail-item single-item amount-item" @click="openPopup" v-if="detail.projectId">
<view class="detail-item single-item amount-item" v-if="detail.projectId" @click="openPopup">
<text class="item-icon icon-creator"></text>
<view class="item-label">项目编号</view>
<view class="item-label">项目编号</view>
<view class="item-value">{{ detail.projectNum || '无' }}</view>
</view>
<view class="detail-item single-item amount-item" @click="openPopup" v-if="detail.projectId">
<view class="detail-item single-item amount-item" v-if="detail.projectId" @click="openPopup">
<text class="item-icon icon-creator"></text>
<view class="item-label">项目代号</view>
<view class="item-label">项目代号</view>
<view class="item-value">{{ detail.projectCode || '无' }}</view>
</view>
@@ -119,55 +122,113 @@
</template>
<script>
import {
getAppropriationReq
} from '@/api/hrm/appropriation.js'
import { getAppropriationReq } from '@/api/hrm/appropriation.js'
export default {
props: {
bizId: {
type: String,
required: true
}
},
data() {
return {
detail: {}
}
},
watch: {
bizId: {
handler(newVal) {
// 增加空值判断,避免无效请求
if (newVal) {
getAppropriationReq(newVal).then(res => {
this.detail = res.data || {}
console.log(this.detail)
})
}
},
immediate: true
}
},
methods: {
/**
* 时间格式化方法
* 将 "2026-01-08 00:00:00" 格式化为 "2026-01-08"
* @param {String} timeStr - 原始时间字符串
* @returns {String} 格式化后的日期
*/
formatTime(timeStr) {
if (!timeStr) return '';
const [datePart] = timeStr.split(' ');
return datePart;
export default {
props: {
bizId: {
type: String,
required: true
}
},
data() {
return {
detail: {}
}
},
watch: {
bizId: {
handler(newVal) {
if (!newVal) return
getAppropriationReq(newVal)
.then(res => {
this.detail = res.data || {}
})
.catch(err => {
console.error('获取拨款详情失败:', err)
uni.showToast({ title: '获取详情失败', icon: 'none', duration: 2000 })
})
},
openPopup() {
this.$refs.popup.open()
}
immediate: true
}
},
methods: {
formatTime(timeStr) {
if (!timeStr) return ''
const [datePart] = timeStr.split(' ')
return datePart
},
openPopup() {
this.$refs.popup.open()
}
}
}
</script>
<style scoped>
.leave-detail-container {
background: #ffffff;
border-radius: 18rpx;
margin: 20rpx 16rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
box-sizing: border-box;
}
.detail-item {
display: flex;
align-items: flex-start;
line-height: 48rpx;
padding: 20rpx 0;
border-bottom: 1px solid #f9f9f9;
}
.detail-item:last-child { border-bottom: none; }
.single-item { flex-direction: row; }
.item-icon {
display: inline-block;
width: 32rpx;
height: 32rpx;
margin-right: 12rpx;
margin-top: 8rpx;
flex-shrink: 0;
color: #409eff;
font-family: "iconfont";
}
.icon-travel-type { content: "\e645"; }
.icon-user { content: "\e6b8"; }
.icon-amount { content: "\e62e"; }
.icon-bank { content: "\e673"; }
.icon-card { content: "\e682"; }
.icon-remark { content: "\e634"; }
.icon-creator { content: "\e600"; }
.icon-date { content: "\e637"; }
.item-label {
width: 160rpx;
font-size: 30rpx;
color: #909399;
font-weight: 500;
flex-shrink: 0;
padding-top: 2rpx;
}
.item-value {
flex: 1;
font-size: 30rpx;
color: #333333;
word-break: break-all;
line-height: 48rpx;
}
.multi-line .item-value { line-height: 52rpx; padding-top: 4rpx; }
.amount-item .item-value { color: #409eff; font-weight: 600; font-size: 32rpx; }
.detail-content {
border: 1px solid #ccc;
border-radius: 10px;
padding: 15px;
background-color: #f9f9f9;
}
.info-item { display: flex; justify-content: space-between; margin-top: 10px; }
.info-label { color: #333; font-weight: bold; }
.info-value { color: #666; }
</style>
<style scoped>
/* 主容器 - 与请假/报销/用印申请完全一致的卡片风格,精致阴影+大圆角+合理内边距 */
.reimburse-detail-container {

View File

@@ -134,10 +134,26 @@
},
methods: {
formatTime(timeStr) {
if (!timeStr) return '';
const [datePart] = timeStr.split(' ');
return datePart;
if (!timeStr) return ''
var str = String(timeStr).trim()
// 兼容后端常见时间格式:"2026-01-08 00:00:00" / "2026-01-08T00:00:00" / 时间戳
if (/^\d+$/.test(str)) {
var ts = Number(str)
if (!Number.isNaN(ts)) {
var d = new Date(ts)
if (!Number.isNaN(d.getTime())) {
return this.pad(d.getFullYear(), 4) + '-' + this.pad(d.getMonth() + 1) + '-' + this.pad(d.getDate())
}
}
}
str = str.replace('T', ' ')
var parts = str.split(' ')
return parts[0] || str
},
pad(n, len = 2) {
return String(n).padStart(len, '0')
},
openPopup() {
this.$refs.popup.open()
},

View File

@@ -43,9 +43,13 @@
<view class="item-value">{{ detail.updateBy || '无' }}</view>
</view>
<view class="detail-item single-item">
<text class="item-icon icon-date"></text>
<view class="item-label">附件</view>
<view class="item-value">
<text class="item-icon icon-date"></text>
<view class="item-label">附件</view>
<view class="item-value">
<view v-if="uploading" class="upload-loading">
<text class="loading-dot"></text>
<text class="loading-text">附件正在上传中...</text>
</view>
<oa-file-list :files="detail.accessoryApplyIds"></oa-file-list>
</view>
</view>