Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Your Name
|
e76f16193b |
@@ -223,15 +223,6 @@
|
|||||||
"backgroundColor": "#c7d2fe",
|
"backgroundColor": "#c7d2fe",
|
||||||
"disableScroll": true
|
"disableScroll": true
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "endless-game/index",
|
|
||||||
"style": {
|
|
||||||
"navigationStyle": "custom",
|
|
||||||
"navigationBarTitleText": "控糖消消乐",
|
|
||||||
"backgroundColor": "#eefbf4",
|
|
||||||
"disableScroll": false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
# 控糖消消乐独立功能包
|
|
||||||
|
|
||||||
此目录包含“控糖消消乐”无尽三消版的页面与运行代码。食品图片由远端 COS 提供，图标组件复用 `tongji` 分包的公共组件。
|
|
||||||
|
|
||||||
## 目录内容
|
|
||||||
|
|
||||||
- `index.vue`：页面、棋盘算法、关卡主题、任务、道具、三/四/五连奖励和适老化交互。
|
|
||||||
- `game-endless.scss`：完整页面与动画样式。
|
|
||||||
- `composables/useGameSfx.js`：滑动、掉落、消除、连击和大奖音效。
|
|
||||||
|
|
||||||
## 迁移步骤
|
|
||||||
|
|
||||||
1. 复制 `endless-game` 文件夹到目标项目的 `tongji/` 目录，并确保目标项目同时提供 `tongji/components/TongjiIcon.vue` 与 `tongji/utils/svgDataUrl.js`。
|
|
||||||
2. 在目标项目 `pages.json` 的 `tongji` 分包 `pages` 数组中加入：
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"path": "endless-game/index",
|
|
||||||
"style": {
|
|
||||||
"navigationStyle": "custom",
|
|
||||||
"navigationBarTitleText": "控糖消消乐",
|
|
||||||
"backgroundColor": "#eefbf4",
|
|
||||||
"disableScroll": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
3. 使用 `/tongji/endless-game/index` 打开游戏。
|
|
||||||
4. 微信小程序后台需要将 `https://gz-1349751149.cos.ap-guangzhou.myqcloud.com` 配置为合法的音频与图片下载域名。
|
|
||||||
|
|
||||||
## 说明
|
|
||||||
|
|
||||||
- 当前项目另有 `/tongji/pages/game` 页面，不属于本独立功能包，迁移时无需复制。
|
|
||||||
- 食品图片固定使用 `https://gz-1349751149.cos.ap-guangzhou.myqcloud.com/games/food/` 前缀，文件名必须与 `FOODS` 配置 key 的大小写保持一致。
|
|
||||||
- 连消小目标按“连消×2”累计 2 次；连续 6 次普通消除没有连消时，下一次掉落会提供连消机会。“连消×3”保留为额外积分、驼乳粉与撒花惊喜，不阻挡主线任务。
|
|
||||||
- 横向 3 个与竖向 3 个相交形成 L/T 形五消时，会在交点生成带高对比 L 标记的范围爆破棋子；该棋子再次被消除时清除周围九格。
|
|
||||||
- 进入游戏时展示“本周 7 人同行榜”界面原型，包含前后名次、差距提示和可切换的同行/亲友鼓励；顶部“本周同行”可再次打开。当前榜单明确标注为预览数据，正式用户关系和周榜成绩需要后端接口接入。
|
|
||||||
- 本功能包依赖 uni-app Vue 3、`@dcloudio/uni-app` 以及 `tongji` 分包内的公共 `TongjiIcon` 组件。
|
|
||||||
- 食物风险等级和科普文案集中在 `index.vue` 的 `FOODS` 配置中，正式上线前仍需由医院医生审核。
|
|
||||||
@@ -1,350 +0,0 @@
|
|||||||
/**
|
|
||||||
* 糖分突袭 · 游戏音效（InnerAudioContext 池化，H5/小程序通用）
|
|
||||||
* 每种操作独立音轨 + playbackRate 变调，避免“全是同一个声”
|
|
||||||
*/
|
|
||||||
import { ref, onUnmounted } from 'vue'
|
|
||||||
|
|
||||||
const STORAGE_KEY = 'tongji_game_sfx_enabled'
|
|
||||||
const COS = 'https://gz-1349751149.cos.ap-guangzhou.myqcloud.com/uploads/file'
|
|
||||||
|
|
||||||
/** 9 条基础素材（已上传 COS，小程序域名白名单内） */
|
|
||||||
const SRC = {
|
|
||||||
tap: `${COS}/20260526/20260526105128557ef8669.mp3`,
|
|
||||||
swoosh: `${COS}/20260527/202605271539371ebe13672.mp3`,
|
|
||||||
pop: `${COS}/20260526/202605261051282a0a94508.mp3`,
|
|
||||||
buzz: `${COS}/20260527/202605271539376ff628472.mp3`,
|
|
||||||
chime: `${COS}/20260528/202605280937077bad76716.mp3`,
|
|
||||||
fanfare: `${COS}/20260528/20260528093707b021f5794.mp3`,
|
|
||||||
blast: `${COS}/20260528/20260528093707ebd4d5733.mp3`,
|
|
||||||
sparkle: `${COS}/20260528/20260528093707016f07427.mp3`,
|
|
||||||
stinger: `${COS}/20260528/20260528093709c669f4659.mp3`
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 音效表：src / volume / rate(playbackRate) / pool
|
|
||||||
* rate 不同可在同一素材上听出明显差异
|
|
||||||
*/
|
|
||||||
const SFX = {
|
|
||||||
// —— 基础素材别名（供分层音效直接调用）——
|
|
||||||
tap: { src: SRC.tap, volume: 0.32, rate: 1, pool: 3 },
|
|
||||||
pop: { src: SRC.pop, volume: 0.3, rate: 1, pool: 4 },
|
|
||||||
fanfare: { src: SRC.fanfare, volume: 0.56, rate: 1, pool: 2 },
|
|
||||||
blast: { src: SRC.blast, volume: 0.62, rate: 1, pool: 2 },
|
|
||||||
sparkle: { src: SRC.sparkle, volume: 0.5, rate: 1, pool: 2 },
|
|
||||||
|
|
||||||
// —— 交互 ——
|
|
||||||
select: { src: SRC.tap, volume: 0.32, rate: 1.05, pool: 3 },
|
|
||||||
deselect: { src: SRC.tap, volume: 0.22, rate: 0.82, pool: 2 },
|
|
||||||
hint: { src: SRC.tap, volume: 0.26, rate: 1.28, pool: 2 },
|
|
||||||
|
|
||||||
swap: { src: SRC.swoosh, volume: 0.38, rate: 1.0, pool: 3 },
|
|
||||||
swapFail: { src: SRC.buzz, volume: 0.36, rate: 1.18, pool: 2 },
|
|
||||||
|
|
||||||
drop: { src: SRC.pop, volume: 0.3, rate: 0.88, pool: 4 },
|
|
||||||
dropLight: { src: SRC.pop, volume: 0.22, rate: 1.22, pool: 2 },
|
|
||||||
|
|
||||||
// —— 消除（按连数）——
|
|
||||||
match3: { src: SRC.chime, volume: 0.48, rate: 1.0, pool: 4 },
|
|
||||||
match4: { src: SRC.fanfare, volume: 0.54, rate: 1.06, pool: 3 },
|
|
||||||
match5: { src: SRC.blast, volume: 0.62, rate: 1.0, pool: 3 },
|
|
||||||
|
|
||||||
// —— 消除（按 GI 主色）——
|
|
||||||
matchLowGi: { src: SRC.chime, volume: 0.42, rate: 0.86, pool: 2 },
|
|
||||||
matchMidGi: { src: SRC.chime, volume: 0.46, rate: 1.02, pool: 2 },
|
|
||||||
matchHighGi: { src: SRC.buzz, volume: 0.44, rate: 0.92, pool: 2 },
|
|
||||||
|
|
||||||
// —— 连消 ——
|
|
||||||
combo2: { src: SRC.fanfare, volume: 0.56, rate: 1.12, pool: 2 },
|
|
||||||
combo3: { src: SRC.blast, volume: 0.64, rate: 1.08, pool: 2 },
|
|
||||||
comboMega: { src: SRC.blast, volume: 0.72, rate: 1.22, pool: 2 },
|
|
||||||
|
|
||||||
// —— 道具 ——
|
|
||||||
insulin: { src: SRC.sparkle, volume: 0.5, rate: 1.15, pool: 2 },
|
|
||||||
fiber: { src: SRC.swoosh, volume: 0.48, rate: 1.32, pool: 2 },
|
|
||||||
meal: { src: SRC.stinger, volume: 0.42, rate: 1.35, pool: 1 },
|
|
||||||
reshuffle: { src: SRC.swoosh, volume: 0.46, rate: 0.72, pool: 2 },
|
|
||||||
|
|
||||||
// —— 反馈 ——
|
|
||||||
score: { src: SRC.tap, volume: 0.28, rate: 1.38, pool: 2 },
|
|
||||||
goalTick: { src: SRC.chime, volume: 0.36, rate: 1.45, pool: 2 },
|
|
||||||
meterWarn: { src: SRC.buzz, volume: 0.5, rate: 1.0, pool: 2 },
|
|
||||||
meterDanger: { src: SRC.buzz, volume: 0.58, rate: 0.78, pool: 2 },
|
|
||||||
meterStable: { src: SRC.pop, volume: 0.24, rate: 1.05, pool: 1 },
|
|
||||||
|
|
||||||
win: { src: SRC.fanfare, volume: 0.66, rate: 1.0, pool: 1 },
|
|
||||||
winStinger: { src: SRC.stinger, volume: 0.38, rate: 1.5, pool: 1 },
|
|
||||||
lose: { src: SRC.buzz, volume: 0.52, rate: 0.68, pool: 1 },
|
|
||||||
|
|
||||||
// 兼容旧名
|
|
||||||
match: { src: SRC.chime, volume: 0.48, rate: 1.0, pool: 4 },
|
|
||||||
combo: { src: SRC.fanfare, volume: 0.56, rate: 1.1, pool: 3 },
|
|
||||||
heal: { src: SRC.pop, volume: 0.44, rate: 1.18, pool: 2 },
|
|
||||||
boost: { src: SRC.sparkle, volume: 0.52, rate: 1.0, pool: 2 },
|
|
||||||
invalid: { src: SRC.buzz, volume: 0.4, rate: 1.15, pool: 2 },
|
|
||||||
danger: { src: SRC.blast, volume: 0.58, rate: 0.95, pool: 2 }
|
|
||||||
}
|
|
||||||
|
|
||||||
const WARMUP_SFX = [
|
|
||||||
'select', 'swap', 'swapFail', 'drop', 'dropLight',
|
|
||||||
'match3', 'match4', 'match5', 'combo2', 'combo3', 'comboMega',
|
|
||||||
'insulin', 'sparkle', 'reshuffle', 'lose'
|
|
||||||
]
|
|
||||||
|
|
||||||
function createAudioContext() {
|
|
||||||
if (typeof Audio !== 'undefined') {
|
|
||||||
const audio = new Audio()
|
|
||||||
audio.preload = 'auto'
|
|
||||||
return {
|
|
||||||
get src() { return audio.src },
|
|
||||||
set src(value) { audio.src = value },
|
|
||||||
get volume() { return audio.volume },
|
|
||||||
set volume(value) { audio.volume = value },
|
|
||||||
get playbackRate() { return audio.playbackRate },
|
|
||||||
set playbackRate(value) { audio.playbackRate = value },
|
|
||||||
play() {
|
|
||||||
const promise = audio.play()
|
|
||||||
if (promise?.catch) promise.catch(() => {})
|
|
||||||
},
|
|
||||||
stop() {
|
|
||||||
audio.pause()
|
|
||||||
try { audio.currentTime = 0 } catch (_) {}
|
|
||||||
},
|
|
||||||
seek(time) {
|
|
||||||
try { audio.currentTime = time } catch (_) {}
|
|
||||||
},
|
|
||||||
destroy() {
|
|
||||||
audio.pause()
|
|
||||||
audio.removeAttribute('src')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return uni.createInnerAudioContext()
|
|
||||||
}
|
|
||||||
|
|
||||||
class SfxPool {
|
|
||||||
constructor(src, size, volume, rate = 1) {
|
|
||||||
this.src = src
|
|
||||||
this.size = size
|
|
||||||
this.volume = volume
|
|
||||||
this.rate = rate
|
|
||||||
this.list = []
|
|
||||||
this.cursor = 0
|
|
||||||
this.warmedUp = false
|
|
||||||
}
|
|
||||||
|
|
||||||
createOne() {
|
|
||||||
const ctx = createAudioContext()
|
|
||||||
ctx.src = this.src
|
|
||||||
ctx.obeyMuteSwitch = false
|
|
||||||
ctx.autoplay = false
|
|
||||||
ctx.volume = this.volume
|
|
||||||
try {
|
|
||||||
ctx.playbackRate = this.rate
|
|
||||||
} catch (_) {}
|
|
||||||
this.list.push(ctx)
|
|
||||||
return ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
create() {
|
|
||||||
while (this.list.length < this.size) this.createOne()
|
|
||||||
}
|
|
||||||
|
|
||||||
warmUp() {
|
|
||||||
if (this.warmedUp) return
|
|
||||||
const ctx = this.list[0] || this.createOne()
|
|
||||||
try {
|
|
||||||
ctx.volume = 0
|
|
||||||
ctx.play()
|
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
ctx.stop()
|
|
||||||
ctx.volume = this.volume
|
|
||||||
} catch (_) {}
|
|
||||||
}, 60)
|
|
||||||
} catch (_) {}
|
|
||||||
if (this.size > 1) this.cursor = 1
|
|
||||||
this.warmedUp = true
|
|
||||||
}
|
|
||||||
|
|
||||||
play(scale = 1, rateMul = 1) {
|
|
||||||
if (this.list.length < this.size) this.create()
|
|
||||||
const ctx = this.list[this.cursor % this.list.length]
|
|
||||||
this.cursor += 1
|
|
||||||
const vol = Math.min(1, this.volume * scale)
|
|
||||||
const rate = Math.min(2, Math.max(0.5, this.rate * rateMul))
|
|
||||||
try {
|
|
||||||
ctx.volume = vol
|
|
||||||
try {
|
|
||||||
ctx.playbackRate = rate
|
|
||||||
} catch (_) {}
|
|
||||||
ctx.stop()
|
|
||||||
ctx.seek(0)
|
|
||||||
ctx.play()
|
|
||||||
} catch (_) {
|
|
||||||
try {
|
|
||||||
ctx.play()
|
|
||||||
} catch (e) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
destroy() {
|
|
||||||
this.list.forEach((ctx) => {
|
|
||||||
try {
|
|
||||||
ctx.stop()
|
|
||||||
ctx.destroy()
|
|
||||||
} catch (_) {}
|
|
||||||
})
|
|
||||||
this.list = []
|
|
||||||
this.warmedUp = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function dominantGi(tiles = []) {
|
|
||||||
const cnt = { low: 0, mid: 0, high: 0 }
|
|
||||||
tiles.forEach((t) => {
|
|
||||||
const g = t?.type?.gi
|
|
||||||
if (g && cnt[g] !== undefined) cnt[g] += 1
|
|
||||||
})
|
|
||||||
let best = 'mid'
|
|
||||||
let max = 0
|
|
||||||
Object.entries(cnt).forEach(([k, v]) => {
|
|
||||||
if (v > max) {
|
|
||||||
max = v
|
|
||||||
best = k
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return best
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useGameSfx() {
|
|
||||||
const enabled = ref(true)
|
|
||||||
const pools = {}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const stored = uni.getStorageSync(STORAGE_KEY)
|
|
||||||
if (stored === false || stored === '0' || stored === 0) {
|
|
||||||
enabled.value = false
|
|
||||||
}
|
|
||||||
} catch (_) {}
|
|
||||||
|
|
||||||
function ensureAudioOption() {
|
|
||||||
// #ifdef MP-WEIXIN
|
|
||||||
try {
|
|
||||||
uni.setInnerAudioOption({
|
|
||||||
obeyMuteSwitch: false,
|
|
||||||
mixWithOther: true
|
|
||||||
})
|
|
||||||
} catch (_) {}
|
|
||||||
// #endif
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPool(name) {
|
|
||||||
const cfg = SFX[name]
|
|
||||||
if (!cfg) return null
|
|
||||||
if (!pools[name]) {
|
|
||||||
pools[name] = new SfxPool(cfg.src, cfg.pool, cfg.volume, cfg.rate ?? 1)
|
|
||||||
}
|
|
||||||
return pools[name]
|
|
||||||
}
|
|
||||||
|
|
||||||
function warmUp() {
|
|
||||||
if (!enabled.value) return
|
|
||||||
ensureAudioOption()
|
|
||||||
const names = typeof Audio !== 'undefined' ? ['select'] : WARMUP_SFX
|
|
||||||
names.forEach((name) => {
|
|
||||||
getPool(name)?.warmUp()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function play(name, scale = 1, rateMul = 1) {
|
|
||||||
if (!enabled.value) return
|
|
||||||
getPool(name)?.play(scale, rateMul)
|
|
||||||
}
|
|
||||||
|
|
||||||
function playLayer(primary, secondary, delayMs = 70, secScale = 0.6) {
|
|
||||||
play(primary)
|
|
||||||
if (secondary) {
|
|
||||||
setTimeout(() => play(secondary, secScale), delayMs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function playMatch({ matchCount = 3, chain = 0, tiles = [] } = {}) {
|
|
||||||
if (!enabled.value) return
|
|
||||||
const giTrack = (() => {
|
|
||||||
const gi = dominantGi(tiles)
|
|
||||||
if (gi === 'low') return 'matchLowGi'
|
|
||||||
if (gi === 'high') return 'matchHighGi'
|
|
||||||
return 'matchMidGi'
|
|
||||||
})()
|
|
||||||
|
|
||||||
if (chain >= 3) {
|
|
||||||
playLayer('comboMega', giTrack, 90, 0.55)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (chain === 2) {
|
|
||||||
playLayer('combo3', giTrack, 80, 0.5)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (chain === 1) {
|
|
||||||
playLayer('combo2', giTrack, 70, 0.45)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (matchCount >= 5) {
|
|
||||||
playLayer('match5', 'matchHighGi', 85, 0.5)
|
|
||||||
} else if (matchCount >= 4) {
|
|
||||||
playLayer('match4', giTrack, 65, 0.48)
|
|
||||||
} else {
|
|
||||||
play(giTrack, 1, 1)
|
|
||||||
setTimeout(() => play('match3', 0.85), 40)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function playDrop(count = 1) {
|
|
||||||
if (!enabled.value || count <= 0) return
|
|
||||||
const name = count >= 4 ? 'drop' : 'dropLight'
|
|
||||||
play(name, Math.min(1.2, 0.85 + count * 0.04), count >= 6 ? 0.9 : 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
function playMeter(delta, level) {
|
|
||||||
if (!enabled.value) return
|
|
||||||
if (level > 70) play('meterDanger', 1 + (level - 70) * 0.02)
|
|
||||||
else if (level < 30) play('meterWarn', 0.9, 0.95)
|
|
||||||
else if (delta > 8) play('meterWarn', 0.75)
|
|
||||||
else if (delta < -5) play('meterStable', 1.1)
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleEnabled() {
|
|
||||||
enabled.value = !enabled.value
|
|
||||||
try {
|
|
||||||
uni.setStorageSync(STORAGE_KEY, enabled.value ? '1' : '0')
|
|
||||||
} catch (_) {}
|
|
||||||
if (enabled.value) {
|
|
||||||
warmUp()
|
|
||||||
play('select')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function destroyAll() {
|
|
||||||
Object.keys(pools).forEach((key) => {
|
|
||||||
pools[key]?.destroy()
|
|
||||||
delete pools[key]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
onUnmounted(() => {
|
|
||||||
destroyAll()
|
|
||||||
})
|
|
||||||
|
|
||||||
return {
|
|
||||||
enabled,
|
|
||||||
play,
|
|
||||||
playLayer,
|
|
||||||
playMatch,
|
|
||||||
playDrop,
|
|
||||||
playMeter,
|
|
||||||
warmUp,
|
|
||||||
toggleEnabled,
|
|
||||||
destroyAll
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,564 +0,0 @@
|
|||||||
.eg-page {
|
|
||||||
min-height: 100vh;
|
|
||||||
color: #173b32;
|
|
||||||
background: linear-gradient(180deg, #eefbf4 0%, #f9f3dd 56%, #fffaf1 100%);
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Microsoft YaHei', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.eg-confetti-layer { position: fixed; z-index: 80; inset: 0; overflow: hidden; pointer-events: none; }
|
|
||||||
.eg-confetti-piece {
|
|
||||||
position: absolute;
|
|
||||||
top: -70rpx;
|
|
||||||
display: block;
|
|
||||||
border-radius: 3rpx;
|
|
||||||
box-shadow: 0 2rpx 4rpx rgba(0,0,0,.12);
|
|
||||||
animation-name: egConfettiFall;
|
|
||||||
animation-timing-function: cubic-bezier(.18,.72,.35,1);
|
|
||||||
animation-fill-mode: both;
|
|
||||||
}
|
|
||||||
.eg-confetti-piece.is-emoji { width: auto !important; height: auto !important; background: transparent !important; box-shadow: none; font-size: 42rpx; }
|
|
||||||
|
|
||||||
.eg-nav {
|
|
||||||
position: relative;
|
|
||||||
display: grid;
|
|
||||||
box-sizing: border-box;
|
|
||||||
grid-template-columns: 156rpx minmax(0, 1fr) 156rpx;
|
|
||||||
align-items: center;
|
|
||||||
column-gap: 12rpx;
|
|
||||||
padding-right: 28rpx;
|
|
||||||
padding-bottom: 16rpx;
|
|
||||||
padding-left: 28rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.eg-nav-leading { display: flex; width: 156rpx; justify-content: flex-start; }
|
|
||||||
|
|
||||||
.eg-nav-btn {
|
|
||||||
display: flex;
|
|
||||||
width: 72rpx;
|
|
||||||
height: 72rpx;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border: 2rpx solid rgba(21, 94, 75, .12);
|
|
||||||
border-radius: 24rpx;
|
|
||||||
background: rgba(255,255,255,.82);
|
|
||||||
}
|
|
||||||
|
|
||||||
.eg-nav-actions { display: flex; width: 156rpx; flex-shrink: 0; justify-content: flex-end; gap: 10rpx; }
|
|
||||||
.eg-nav-btn--small { width: 68rpx; height: 68rpx; border-radius: 22rpx; }
|
|
||||||
|
|
||||||
.eg-title-wrap { display: flex; min-width: 0; flex-direction: column; align-items: center; }
|
|
||||||
.eg-title, .eg-subtitle { overflow: hidden; max-width: 100%; white-space: nowrap; text-overflow: ellipsis; }
|
|
||||||
.eg-title { color: #155e4b; font-size: 40rpx; font-weight: 800; }
|
|
||||||
.eg-subtitle { margin-top: 2rpx; color: #648278; font-size: 24rpx; }
|
|
||||||
.eg-content { padding: 0 16rpx 48rpx; }
|
|
||||||
|
|
||||||
.eg-score-card {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
margin-bottom: 16rpx;
|
|
||||||
padding: 18rpx 24rpx;
|
|
||||||
border: 2rpx solid rgba(21, 94, 75, .1);
|
|
||||||
border-radius: 28rpx;
|
|
||||||
background: rgba(255,255,255,.9);
|
|
||||||
box-shadow: 0 10rpx 28rpx rgba(32, 78, 43, .08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.eg-stat { display: flex; flex: 1; flex-direction: column; align-items: center; }
|
|
||||||
.eg-stat--main { border-right: 2rpx solid #e2eee8; border-left: 2rpx solid #e2eee8; }
|
|
||||||
.eg-stat-label { color: #71847d; font-size: 24rpx; }
|
|
||||||
.eg-stat-value { margin-top: 4rpx; color: #204e2b; font-size: 38rpx; font-weight: 800; }
|
|
||||||
.eg-stat-score { margin-top: 2rpx; color: #e16f24; font-size: 46rpx; font-weight: 900; }
|
|
||||||
.eg-stat--rank { position: relative; cursor: pointer; }
|
|
||||||
.eg-stat--rank.is-locked { opacity: .52; }
|
|
||||||
.eg-stat-rank-value { margin-top: 1rpx; color: #176b52; font-size: 35rpx; font-weight: 1000; line-height: 1.08; }
|
|
||||||
.eg-stat-rank-hint { margin-top: 2rpx; color: #df7427; font-size: 18rpx; font-weight: 800; }
|
|
||||||
|
|
||||||
.eg-task-card {
|
|
||||||
margin-bottom: 16rpx;
|
|
||||||
padding: 18rpx 22rpx;
|
|
||||||
border-radius: 24rpx;
|
|
||||||
background: rgba(255, 249, 223, .94);
|
|
||||||
box-shadow: 0 8rpx 22rpx rgba(118, 89, 25, .08);
|
|
||||||
}
|
|
||||||
.eg-task-card { position: relative; overflow: visible; }
|
|
||||||
|
|
||||||
.eg-task-reward-flight {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 72;
|
|
||||||
top: 4rpx;
|
|
||||||
left: 42%;
|
|
||||||
display: flex;
|
|
||||||
width: 112rpx;
|
|
||||||
height: 92rpx;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border: 4rpx solid rgba(255,255,255,.96);
|
|
||||||
border-radius: 24rpx;
|
|
||||||
background: #fff7e8;
|
|
||||||
box-shadow: 0 10rpx 24rpx rgba(159,94,23,.28);
|
|
||||||
animation: egTaskRewardFlight 1.12s cubic-bezier(.18,.78,.22,1) both;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
.eg-task-reward-flight > image { position: relative; z-index: 2; width: 78rpx; height: 66rpx; }
|
|
||||||
.eg-task-reward-flight > text { position: absolute; z-index: 3; top: -14rpx; right: -16rpx; display: flex; width: 48rpx; height: 48rpx; align-items: center; justify-content: center; border: 4rpx solid #fff; border-radius: 50%; color: #fff; background: #ed7625; box-shadow: 0 5rpx 12rpx rgba(191,75,19,.3); font-size: 25rpx; font-weight: 1000; }
|
|
||||||
.eg-task-reward-glow { position: absolute; z-index: 1; inset: -15rpx; border-radius: 32rpx; background: radial-gradient(circle, rgba(255,210,67,.52), rgba(255,210,67,0) 68%); animation: egRewardGlow .42s ease-in-out infinite alternate; }
|
|
||||||
|
|
||||||
.eg-task-head { display: flex; align-items: center; justify-content: space-between; color: #7c5b1b; font-size: 27rpx; font-weight: 700; }
|
|
||||||
.eg-task-name { display: flex; align-items: center; gap: 10rpx; }
|
|
||||||
.eg-task-count { color: #9a6718; font-size: 29rpx; }
|
|
||||||
.eg-progress { height: 14rpx; margin-top: 12rpx; overflow: hidden; border-radius: 999rpx; background: #eadfbd; }
|
|
||||||
.eg-progress-fill { height: 100%; border-radius: inherit; background: linear-gradient(90deg, #f0a128, #f4c34f); transition: width .25s; }
|
|
||||||
|
|
||||||
.eg-board-shell {
|
|
||||||
position: relative;
|
|
||||||
padding: 14rpx;
|
|
||||||
border: 2rpx solid rgba(34, 103, 79, .16);
|
|
||||||
border-radius: 34rpx;
|
|
||||||
background: rgba(255,255,255,.92);
|
|
||||||
box-shadow: 0 18rpx 44rpx rgba(29, 78, 59, .12);
|
|
||||||
}
|
|
||||||
|
|
||||||
.eg-board-top { display: flex; align-items: center; justify-content: space-between; margin: 0 4rpx 14rpx; }
|
|
||||||
.eg-board-bonuses { display: flex; align-items: center; gap: 8rpx; }
|
|
||||||
.eg-combo { padding: 8rpx 16rpx; border-radius: 999rpx; color: #45685d; background: #e8f3ee; font-size: 25rpx; font-weight: 700; }
|
|
||||||
.eg-combo.is-hot { color: #fff; background: linear-gradient(135deg, #f59e0b, #ea580c); }
|
|
||||||
.eg-double-state { padding: 8rpx 14rpx; border: 2rpx solid rgba(255,255,255,.9); border-radius: 999rpx; color: #fff; background: linear-gradient(135deg, #7c3aed, #d946ef); box-shadow: 0 4rpx 12rpx rgba(124,58,237,.24); font-size: 23rpx; font-weight: 900; white-space: nowrap; }
|
|
||||||
.eg-risk { display: flex; align-items: center; gap: 10rpx; color: #8d512c; font-size: 24rpx; }
|
|
||||||
.eg-risk-dots { display: flex; gap: 5rpx; }
|
|
||||||
.eg-risk-dot { width: 12rpx; height: 12rpx; border-radius: 50%; background: #ead8c9; }
|
|
||||||
.eg-risk-dot.on { background: #e96b3b; box-shadow: 0 0 0 3rpx rgba(233,107,59,.12); }
|
|
||||||
.eg-board { display: flex; flex-direction: column; gap: 8rpx; opacity: 1; transition: opacity .15s; }
|
|
||||||
.eg-board.is-busy { opacity: .82; }
|
|
||||||
.eg-row { display: flex; gap: 8rpx; }
|
|
||||||
|
|
||||||
.eg-cell {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
height: 166rpx;
|
|
||||||
flex: 1;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
overflow: hidden;
|
|
||||||
border: 5rpx solid transparent;
|
|
||||||
border-radius: 26rpx;
|
|
||||||
box-shadow: inset 0 -5rpx 0 rgba(0,0,0,.05), 0 5rpx 12rpx rgba(31, 66, 53, .08);
|
|
||||||
transition: transform .16s cubic-bezier(.2,.8,.2,1), border-color .15s, opacity .16s, filter .16s;
|
|
||||||
will-change: transform;
|
|
||||||
}
|
|
||||||
|
|
||||||
.eg-cell.is-dragging { transition: transform .055s linear, border-color .15s; }
|
|
||||||
.eg-cell.is-selected { z-index: 2; border-color: #167d61; transform: scale(1.06); box-shadow: 0 0 0 6rpx rgba(22,125,97,.14); }
|
|
||||||
.eg-cell.is-camel-target { border-color: #f59e0b; animation: egPulse 1s infinite; }
|
|
||||||
.eg-replace-target { position: absolute; z-index: 7; right: 7rpx; bottom: 6rpx; padding: 4rpx 10rpx; border: 2rpx solid #fff; border-radius: 999rpx; color: #fff; background: #1570a6; box-shadow: 0 3rpx 9rpx rgba(20,91,135,.28); font-size: 20rpx; font-weight: 900; }
|
|
||||||
.eg-cell.is-clearing {
|
|
||||||
z-index: 8;
|
|
||||||
border-color: #fff;
|
|
||||||
animation: egHit .22s cubic-bezier(.2,.9,.3,1) forwards;
|
|
||||||
filter: brightness(1.28) saturate(1.25);
|
|
||||||
}
|
|
||||||
.eg-cell.is-yellow,
|
|
||||||
.eg-cell.is-cream,
|
|
||||||
.eg-cell.is-red,
|
|
||||||
.eg-cell.is-purple { background: #fffaf0; }
|
|
||||||
.eg-cell.is-level-low { background: #f4faf6; }
|
|
||||||
.eg-cell.is-level-mid { background: #fff9eb; }
|
|
||||||
.eg-cell.is-orange,
|
|
||||||
.eg-cell.is-level-high { background: #fff0e4; }
|
|
||||||
.eg-cell.is-milk { background: #edf7ff; }
|
|
||||||
.eg-cell.is-high { border-color: #ef7b45; }
|
|
||||||
.eg-food-image { width: 132rpx; height: 92rpx; margin-top: 7rpx; border-radius: 17rpx; filter: saturate(1.06) contrast(1.03); }
|
|
||||||
.eg-food-name { margin-top: 8rpx; color: #203d34; font-size: 29rpx; font-weight: 900; letter-spacing: 1rpx; line-height: 1.1; }
|
|
||||||
.eg-sugar-tag { position: absolute; top: 5rpx; right: 5rpx; min-width: 52rpx; padding: 4rpx 10rpx; border: 2rpx solid #fff; border-radius: 999rpx; color: #fff; box-shadow: 0 3rpx 8rpx rgba(25,55,45,.22); font-size: 23rpx; font-weight: 900; line-height: 1.25; text-align: center; }
|
|
||||||
.eg-sugar-tag.is-low { color: #316a54; border-color: rgba(255,255,255,.82); background: #dcefe6; box-shadow: 0 2rpx 5rpx rgba(32,101,75,.1); }
|
|
||||||
.eg-sugar-tag.is-mid { color: #735a15; border-color: rgba(255,255,255,.9); background: #f7e7a8; box-shadow: 0 2rpx 6rpx rgba(137,91,0,.15); }
|
|
||||||
.eg-sugar-tag.is-high { background: #d9431f; box-shadow: 0 4rpx 10rpx rgba(163,45,21,.32); }
|
|
||||||
.eg-sugar-tag.is-prop { background: #2563a8; }
|
|
||||||
.eg-special-mark { position: absolute; z-index: 12; bottom: 5rpx; left: 6rpx; display: flex; width: 40rpx; height: 40rpx; align-items: center; justify-content: center; border: 3rpx solid rgba(255,255,255,.96); border-radius: 50%; color: #fff; background: #6d28d9; box-shadow: 0 4rpx 11rpx rgba(73,31,130,.3); font-size: 23rpx; font-weight: 900; }
|
|
||||||
.eg-special-mark.is-row { width: 58rpx; height: 40rpx; border-radius: 999rpx; background: linear-gradient(135deg, #ffd64d, #ff8a18 48%, #e83b22); box-shadow: 0 0 0 4rpx rgba(255,172,30,.2), 0 4rpx 15rpx rgba(203,59,26,.45); animation: egFlameReady .7s ease-in-out infinite alternate; }
|
|
||||||
.eg-special-mark.is-col { width: 40rpx; height: 58rpx; border-radius: 999rpx; background: linear-gradient(180deg, #ffd64d, #ff8a18 48%, #e83b22); box-shadow: 0 0 0 4rpx rgba(255,172,30,.2), 0 4rpx 15rpx rgba(203,59,26,.45); animation: egFlameReady .7s ease-in-out infinite alternate; }
|
|
||||||
.eg-special-mark.is-burst { width: 48rpx; height: 48rpx; border-color: #fff3a8; border-radius: 15rpx 50% 50%; background: linear-gradient(145deg, #7c3aed 5%, #dd3b70 48%, #ff8a18 100%); box-shadow: 0 4rpx 13rpx rgba(108,35,155,.38), 0 0 12rpx rgba(255,179,38,.3); animation: egLReady 1.25s ease-in-out infinite alternate; }
|
|
||||||
.eg-mini-flame { position: relative; width: 25rpx; height: 30rpx; border-radius: 70% 32% 68% 40%; background: linear-gradient(135deg, #fff8a8 8%, #ffc21f 42%, #f04420 84%); box-shadow: 0 0 14rpx rgba(255,230,92,.95); transform: rotate(43deg); }
|
|
||||||
.eg-mini-flame-core { position: absolute; right: 4rpx; bottom: 3rpx; width: 10rpx; height: 15rpx; border-radius: 70% 35% 70% 42%; background: #fffbd1; box-shadow: 0 0 7rpx rgba(255,255,210,.95); }
|
|
||||||
.eg-l-special { position: relative; width: 29rpx; height: 29rpx; filter: drop-shadow(0 1rpx 2rpx rgba(73,22,105,.3)); }
|
|
||||||
.eg-l-arm { position: absolute; left: 3rpx; bottom: 3rpx; border-radius: 999rpx; background: #fff9b8; box-shadow: 0 0 6rpx rgba(255,249,184,.92); }
|
|
||||||
.eg-l-arm.is-vertical { width: 8rpx; height: 25rpx; }
|
|
||||||
.eg-l-arm.is-horizontal { width: 25rpx; height: 8rpx; }
|
|
||||||
.eg-l-core { position: absolute; left: 1rpx; bottom: 1rpx; width: 12rpx; height: 12rpx; border: 2rpx solid #fff; border-radius: 50%; background: #ff5b25; }
|
|
||||||
.eg-cell.is-fire-clearing { border-color: #ff7a1a; box-shadow: inset 0 0 25rpx rgba(255,102,18,.36), 0 0 18rpx rgba(255,105,20,.48); filter: brightness(1.35) saturate(1.42); }
|
|
||||||
.eg-cell.is-clearing.is-fire-clearing { animation: egFireCellHit .36s cubic-bezier(.2,.78,.22,1) forwards; }
|
|
||||||
.eg-fire-clear { position: absolute; z-index: 14; inset: 2rpx; overflow: hidden; border: 3rpx solid rgba(255,210,71,.92); border-radius: 22rpx; opacity: .96; background: linear-gradient(180deg, rgba(255,230,86,.12), rgba(239,63,27,.22)); pointer-events: none; }
|
|
||||||
.eg-fire-glow { position: absolute; inset: 6%; border-radius: 18rpx; background: radial-gradient(circle, rgba(255,246,177,.74), rgba(255,131,22,.32) 47%, rgba(222,47,23,0) 75%); animation: egFireGlow .34s ease-out both; }
|
|
||||||
.eg-fire-sweep { position: absolute; top: 23%; left: -48%; width: 168%; height: 55%; border-radius: 60% 45% 55% 42%; background: linear-gradient(90deg, rgba(255,184,38,0), rgba(255,238,124,.94) 28%, rgba(255,133,22,.92) 53%, rgba(226,54,25,.82) 72%, rgba(255,184,38,0)); box-shadow: 0 0 27rpx rgba(255,91,17,.72); animation: egFireSweep .34s cubic-bezier(.2,.78,.22,1) both; }
|
|
||||||
.eg-fire-flame { position: absolute; bottom: 13%; width: 25rpx; height: 39rpx; border-radius: 72% 35% 68% 42%; background: linear-gradient(145deg, #fff7a6 4%, #ffc329 39%, #ff7419 66%, #dc321f 100%); box-shadow: 0 0 15rpx rgba(255,124,21,.88); transform: rotate(42deg); animation: egFireFlame .34s ease-out both; }
|
|
||||||
.eg-fire-flame > view { position: absolute; right: 5rpx; bottom: 4rpx; width: 10rpx; height: 18rpx; border-radius: 70% 35% 70% 42%; background: #fffbd6; }
|
|
||||||
.eg-fire-flame.is-left { left: 16%; animation-delay: .01s; }
|
|
||||||
.eg-fire-flame.is-center { left: 43%; bottom: 19%; transform: rotate(42deg) scale(1.18); animation-delay: .035s; }
|
|
||||||
.eg-fire-flame.is-right { right: 15%; animation-delay: .065s; }
|
|
||||||
.eg-fire-spark { position: absolute; width: 10rpx; height: 17rpx; border-radius: 70% 35% 70% 42%; background: #ffe45e; box-shadow: 0 0 11rpx rgba(255,139,28,.9); animation: egFireSpark .34s ease-out both; }
|
|
||||||
.eg-fire-spark.is-one { top: 46%; left: 25%; }
|
|
||||||
.eg-fire-spark.is-two { top: 34%; left: 62%; animation-delay: .035s; }
|
|
||||||
.eg-fire-spark.is-three { top: 52%; left: 78%; animation-delay: .07s; }
|
|
||||||
.eg-board-tip { display: flex; align-items: center; justify-content: center; gap: 8rpx; min-height: 58rpx; margin-top: 12rpx; color: #684817; font-size: 26rpx; font-weight: 700; text-align: center; }
|
|
||||||
.eg-impact-text {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 20;
|
|
||||||
top: 46%;
|
|
||||||
left: 50%;
|
|
||||||
padding: 10rpx 24rpx;
|
|
||||||
border: 4rpx solid rgba(255,255,255,.9);
|
|
||||||
border-radius: 999rpx;
|
|
||||||
color: #fff;
|
|
||||||
background: linear-gradient(135deg, #f59e0b, #e4572e);
|
|
||||||
box-shadow: 0 10rpx 28rpx rgba(190, 70, 25, .35);
|
|
||||||
font-size: 34rpx;
|
|
||||||
font-weight: 900;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
animation: egImpact .52s cubic-bezier(.16,.82,.3,1) forwards;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
.eg-impact-text.is-level-2 { font-size: 40rpx; background: linear-gradient(135deg, #8b5cf6, #ec4899); }
|
|
||||||
.eg-impact-text.is-level-3 { font-size: 46rpx; background: linear-gradient(135deg, #ef4444, #f59e0b); box-shadow: 0 12rpx 36rpx rgba(239,68,68,.42); }
|
|
||||||
.eg-jackpot {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 30;
|
|
||||||
top: 48%;
|
|
||||||
left: 50%;
|
|
||||||
width: 540rpx;
|
|
||||||
padding: 24rpx 22rpx 20rpx;
|
|
||||||
overflow: hidden;
|
|
||||||
border: 7rpx solid #ffd83d;
|
|
||||||
border-radius: 36rpx;
|
|
||||||
color: #fff;
|
|
||||||
background: radial-gradient(circle at 50% 0%, #ef4444, #9f1239 65%, #64102a);
|
|
||||||
box-shadow: 0 0 0 7rpx #fff2a8, 0 22rpx 52rpx rgba(100,16,42,.5);
|
|
||||||
text-align: center;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
animation: egJackpotIn 1.35s cubic-bezier(.16,.85,.25,1) forwards;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
.eg-jackpot.is-match-4 { background: radial-gradient(circle at 50% 0%, #8b5cf6, #5b21b6 68%, #35106d); }
|
|
||||||
.eg-jackpot.is-match-5 { border-color: #fff36a; background: radial-gradient(circle at 50% 0%, #ff6b24, #d7193f 58%, #760c2a); animation-duration: 1.9s; }
|
|
||||||
.eg-jackpot.is-match-3 {
|
|
||||||
width: 414rpx;
|
|
||||||
padding: 20rpx 22rpx 18rpx;
|
|
||||||
border-width: 4rpx;
|
|
||||||
border-color: #f1c663;
|
|
||||||
color: #31574b;
|
|
||||||
background: linear-gradient(155deg, #f7fff9, #fff5d9);
|
|
||||||
box-shadow: 0 0 0 4rpx rgba(255,255,255,.84), 0 14rpx 34rpx rgba(98,82,39,.2);
|
|
||||||
animation: egTripleIn 1.12s cubic-bezier(.2,.82,.28,1) forwards;
|
|
||||||
}
|
|
||||||
.eg-jackpot.is-match-3 .eg-jackpot-lights { display: none; }
|
|
||||||
.eg-jackpot.is-match-3 .eg-jackpot-kicker { color: #5b8c73; font-size: 21rpx; letter-spacing: 3rpx; text-shadow: none; }
|
|
||||||
.eg-jackpot.is-match-3 .eg-jackpot-title { color: #365b4e; font-size: 31rpx; text-shadow: none; }
|
|
||||||
.eg-jackpot.is-match-3 .eg-jackpot-reward { color: #ad7021; font-size: 25rpx; }
|
|
||||||
.eg-jackpot.is-match-3 .eg-jackpot-note { color: #829087; }
|
|
||||||
.eg-triple-cans { position: relative; display: flex; justify-content: center; gap: 12rpx; margin: 12rpx 0 10rpx; }
|
|
||||||
.eg-triple-can { display: flex; width: 78rpx; height: 76rpx; align-items: center; justify-content: center; border: 3rpx solid #f4d996; border-radius: 19rpx; background: rgba(255,255,255,.9); box-shadow: 0 5rpx 12rpx rgba(128,92,30,.12); animation: egTripleCan .42s cubic-bezier(.2,.86,.26,1) both; }
|
|
||||||
.eg-triple-can:nth-child(2) { animation-delay: .07s; }
|
|
||||||
.eg-triple-can:nth-child(3) { animation-delay: .14s; }
|
|
||||||
.eg-triple-can > image { width: 62rpx; height: 58rpx; }
|
|
||||||
|
|
||||||
.eg-jackpot.is-match-4 {
|
|
||||||
width: 548rpx;
|
|
||||||
padding: 25rpx 22rpx 22rpx;
|
|
||||||
border-color: #ffd95b;
|
|
||||||
background: radial-gradient(circle at 50% -10%, #a97cff, #6031b5 58%, #341066);
|
|
||||||
box-shadow: 0 0 0 6rpx #fff0a9, 0 0 36rpx rgba(255,210,76,.5), 0 24rpx 58rpx rgba(53,16,109,.48);
|
|
||||||
animation: egFourIn 1.88s cubic-bezier(.16,.84,.24,1) forwards;
|
|
||||||
}
|
|
||||||
.eg-jackpot.is-match-4 .eg-jackpot-kicker { color: #ffef8d; font-size: 24rpx; letter-spacing: 3rpx; }
|
|
||||||
.eg-jackpot.is-match-4 .eg-jackpot-title { margin-top: 9rpx; color: #fff; font-size: 39rpx; }
|
|
||||||
.eg-jackpot.is-match-4 .eg-jackpot-reward { color: #fff2a8; }
|
|
||||||
.eg-four-teaser { position: relative; margin-top: 13rpx; }
|
|
||||||
.eg-four-cans { display: flex; align-items: center; justify-content: center; gap: 8rpx; }
|
|
||||||
.eg-four-can { display: flex; width: 76rpx; height: 92rpx; align-items: center; justify-content: center; border: 4rpx solid #ffe078; border-radius: 18rpx; background: linear-gradient(180deg, #fffef7, #ffe9a5); box-shadow: inset 0 -5rpx 0 rgba(171,106,17,.12), 0 7rpx 13rpx rgba(34,12,67,.28); animation: egFourCan .48s cubic-bezier(.18,.9,.25,1.2) both; }
|
|
||||||
.eg-four-can:nth-child(2) { animation-delay: .07s; }
|
|
||||||
.eg-four-can:nth-child(3) { animation-delay: .14s; }
|
|
||||||
.eg-four-can:nth-child(4) { animation-delay: .21s; }
|
|
||||||
.eg-four-can > image { width: 64rpx; height: 70rpx; }
|
|
||||||
.eg-four-can.is-locked { border-style: dashed; border-color: rgba(255,241,161,.86); color: #fff6ae; background: rgba(48,18,91,.54); box-shadow: inset 0 0 16rpx rgba(255,225,91,.18), 0 0 18rpx rgba(255,222,91,.36); font-size: 48rpx; font-weight: 1000; animation: egLockedCan .68s .34s ease-in-out infinite alternate; }
|
|
||||||
.eg-four-promise { display: inline-flex; margin-top: 15rpx; padding: 8rpx 18rpx; border: 2rpx solid rgba(255,247,184,.72); border-radius: 999rpx; color: #3d176f; background: linear-gradient(90deg, #fff3a3, #ffd85b); box-shadow: 0 5rpx 15rpx rgba(28,7,62,.22); font-size: 25rpx; font-weight: 1000; animation: egPromisePulse .72s ease-in-out infinite alternate; }
|
|
||||||
.eg-five-celebration { position: relative; margin: 15rpx 0 10rpx; }
|
|
||||||
.eg-five-cans { display: flex; align-items: center; justify-content: center; gap: 8rpx; }
|
|
||||||
.eg-five-can { display: flex; width: 78rpx; height: 93rpx; align-items: center; justify-content: center; border: 4rpx solid #fff17b; border-radius: 18rpx; background: linear-gradient(180deg, #fff, #fff2ac); box-shadow: inset 0 -5rpx 0 rgba(184,91,12,.13), 0 7rpx 0 #bd5b13, 0 0 16rpx rgba(255,240,101,.5); animation: egFiveCan .56s cubic-bezier(.16,.92,.24,1.2) both; }
|
|
||||||
.eg-five-can:nth-child(2) { animation-delay: .07s; }
|
|
||||||
.eg-five-can:nth-child(3) { animation-delay: .14s; }
|
|
||||||
.eg-five-can:nth-child(4) { animation-delay: .21s; }
|
|
||||||
.eg-five-can:nth-child(5) { animation-delay: .28s; }
|
|
||||||
.eg-five-can > image { width: 65rpx; height: 72rpx; }
|
|
||||||
.eg-five-sevens { display: flex; justify-content: center; gap: 8rpx; margin-top: 13rpx; }
|
|
||||||
.eg-five-sevens > text { display: flex; width: 58rpx; height: 55rpx; align-items: center; justify-content: center; border: 3rpx solid #fff5a7; border-radius: 13rpx; color: #fff36a; background: linear-gradient(155deg, #d7193f, #9f1239); box-shadow: 0 5rpx 0 #70102b, 0 0 13rpx rgba(255,243,106,.45); font-size: 43rpx; font-weight: 1000; line-height: 1; text-shadow: 0 3rpx 0 #8f1733; }
|
|
||||||
.eg-jackpot-lights { position: absolute; inset: 8rpx; border: 4rpx dotted rgba(255,255,255,.88); border-radius: 25rpx; animation: egLights .24s steps(2) infinite; }
|
|
||||||
.eg-jackpot-kicker { position: relative; display: block; color: #fff36a; font-size: 28rpx; font-weight: 900; letter-spacing: 6rpx; text-shadow: 0 3rpx 0 rgba(83,19,25,.45); }
|
|
||||||
.eg-jackpot-reels { position: relative; display: flex; justify-content: center; gap: 12rpx; margin: 13rpx 0; }
|
|
||||||
.eg-jackpot-reel { display: flex; width: 112rpx; height: 126rpx; flex-direction: column; align-items: center; justify-content: center; border: 6rpx solid #ffcf31; border-radius: 20rpx; background: linear-gradient(180deg, #fff 0%, #fff7cf 48%, #ffd55e 50%, #fff 53%, #fff8dc 100%); box-shadow: inset 0 0 18rpx rgba(137,78,10,.25), 0 7rpx 0 #a85a0a; animation: egReelStop .52s cubic-bezier(.2,.9,.25,1) both; }
|
|
||||||
.eg-jackpot-reel:nth-child(2) { animation-delay: .09s; }
|
|
||||||
.eg-jackpot-reel:nth-child(3) { animation-delay: .18s; }
|
|
||||||
.eg-jackpot-seven { color: #e11d48; font-size: 61rpx; font-weight: 1000; line-height: .85; text-shadow: 0 3rpx 0 #ffd1d8; }
|
|
||||||
.eg-jackpot-milk { width: 54rpx; height: 36rpx; margin-top: 3rpx; border-radius: 7rpx; }
|
|
||||||
.eg-jackpot-title { position: relative; display: block; font-size: 37rpx; font-weight: 900; text-shadow: 0 4rpx 0 rgba(73,10,30,.5); }
|
|
||||||
.eg-jackpot-points { position: relative; display: block; margin-top: 2rpx; color: #fff36a; font-size: 66rpx; font-weight: 1000; line-height: 1.05; letter-spacing: 2rpx; text-shadow: 0 5rpx 0 #9e2813, 0 0 18rpx rgba(255,243,106,.85); animation: egPointsPop .62s .42s cubic-bezier(.16,.9,.25,1.25) both; }
|
|
||||||
.eg-jackpot-reward { position: relative; display: block; margin-top: 7rpx; color: #fff5a5; font-size: 27rpx; font-weight: 800; line-height: 1.35; }
|
|
||||||
.eg-jackpot-note { position: relative; display: block; margin-top: 8rpx; color: rgba(255,255,255,.8); font-size: 22rpx; }
|
|
||||||
.eg-tools { margin-top: 16rpx; }
|
|
||||||
.eg-tool { display: flex; align-items: center; padding: 16rpx 18rpx; border: 3rpx solid #c9e0d6; border-radius: 26rpx; background: rgba(255,255,255,.92); box-shadow: 0 7rpx 18rpx rgba(24, 84, 63, .07); }
|
|
||||||
.eg-tool.active { border-color: #f59e0b; background: #fffbeb; }
|
|
||||||
.eg-tool.disabled { opacity: .45; }
|
|
||||||
.eg-tool-icon { position: relative; display: flex; width: 88rpx; height: 88rpx; align-items: center; justify-content: center; overflow: visible; border-radius: 24rpx; font-size: 46rpx; background: linear-gradient(145deg, #e8f7ff, #d4ecff); box-shadow: inset 0 -4rpx 0 rgba(33,104,151,.08); }
|
|
||||||
.eg-tool-food-image { width: 76rpx; height: 58rpx; border-radius: 14rpx; }
|
|
||||||
.eg-replace-badge { position: absolute; right: -12rpx; bottom: -8rpx; display: flex; min-width: 78rpx; height: 38rpx; align-items: center; justify-content: center; gap: 2rpx; padding: 0 8rpx; border: 3rpx solid #fff; border-radius: 999rpx; color: #fff; background: linear-gradient(135deg, #2389b9, #145d91); box-shadow: 0 5rpx 12rpx rgba(20,93,145,.3); }
|
|
||||||
.eg-replace-badge .tj-icon-wrap { width: 22rpx; height: 22rpx; }
|
|
||||||
.eg-replace-badge > text { font-size: 20rpx; font-weight: 900; line-height: 1; }
|
|
||||||
.eg-tool-copy { display: flex; flex: 1; flex-direction: column; margin-left: 16rpx; }
|
|
||||||
.eg-tool-name { color: #244a3d; font-size: 29rpx; font-weight: 800; }
|
|
||||||
.eg-tool-desc { margin-top: 5rpx; color: #6c8179; font-size: 25rpx; }
|
|
||||||
.eg-tool-count { color: #155e4b; font-size: 32rpx; font-weight: 900; }
|
|
||||||
.eg-legend { display: flex; justify-content: center; gap: 18rpx; margin-top: 18rpx; color: #53685f; font-size: 25rpx; font-weight: 700; }
|
|
||||||
.eg-dot--safe { color: #4cae7b; }
|
|
||||||
.eg-dot--mid { color: #e2aa19; }
|
|
||||||
.eg-dot--high { color: #e4572e; }
|
|
||||||
|
|
||||||
.eg-weekly-overlay { position: fixed; z-index: 90; inset: 0; display: flex; align-items: center; justify-content: center; padding: 28rpx; background: rgba(16, 55, 43, .66); backdrop-filter: blur(5px); }
|
|
||||||
.eg-weekly-card { width: 100%; max-width: 664rpx; max-height: calc(100vh - 56rpx); overflow-y: auto; padding: 28rpx 26rpx 22rpx; border: 5rpx solid rgba(255,255,255,.96); border-radius: 38rpx; background: linear-gradient(160deg, #f5fff9 0%, #fffdf3 56%, #fff4db 100%); box-shadow: 0 30rpx 80rpx rgba(5,45,32,.38); animation: egWeeklyIn .36s cubic-bezier(.18,.88,.27,1.08) both; }
|
|
||||||
.eg-weekly-head { display: flex; align-items: center; justify-content: space-between; }
|
|
||||||
.eg-weekly-title-line { display: flex; align-items: center; gap: 10rpx; }
|
|
||||||
.eg-weekly-title { color: #155e4b; font-size: 37rpx; font-weight: 1000; }
|
|
||||||
.eg-weekly-preview { padding: 5rpx 10rpx; border-radius: 999rpx; color: #9a5b14; background: #fff0bd; font-size: 19rpx; font-weight: 900; }
|
|
||||||
.eg-weekly-sub { display: block; margin-top: 5rpx; color: #6b837a; font-size: 23rpx; font-weight: 700; }
|
|
||||||
.eg-weekly-medal { display: flex; width: 76rpx; height: 76rpx; align-items: center; justify-content: center; border: 5rpx solid #fff3b2; border-radius: 50%; color: #fff; background: linear-gradient(145deg, #f5ad24, #e26925); box-shadow: 0 8rpx 0 #b85421, 0 12rpx 24rpx rgba(181,84,33,.24); font-size: 39rpx; font-weight: 1000; }
|
|
||||||
.eg-weekly-progress-card { display: flex; align-items: center; justify-content: space-between; margin-top: 20rpx; padding: 16rpx 18rpx; border: 3rpx solid #d7ebe2; border-radius: 24rpx; background: rgba(255,255,255,.9); }
|
|
||||||
.eg-weekly-progress-label { display: block; color: #657b73; font-size: 22rpx; font-weight: 700; }
|
|
||||||
.eg-weekly-progress-value { display: block; margin-top: -2rpx; color: #e06b24; font-size: 43rpx; font-weight: 1000; }
|
|
||||||
.eg-weekly-progress-copy { display: flex; flex-direction: column; align-items: flex-end; color: #235b49; font-size: 24rpx; font-weight: 900; line-height: 1.55; }
|
|
||||||
.eg-weekly-progress-copy text:last-child { color: #b86820; }
|
|
||||||
.eg-weekly-list { display: flex; flex-direction: column; gap: 7rpx; margin-top: 15rpx; }
|
|
||||||
.eg-weekly-row { display: flex; min-height: 68rpx; align-items: center; padding: 7rpx 14rpx; border: 2rpx solid transparent; border-radius: 19rpx; color: #345c50; background: rgba(255,255,255,.72); }
|
|
||||||
.eg-weekly-row.is-me { border-color: #f2bd48; color: #174f3e; background: linear-gradient(90deg, #fff2bb, #fff9e3); box-shadow: 0 5rpx 14rpx rgba(153,102,17,.12); transform: scale(1.015); }
|
|
||||||
.eg-weekly-place { width: 43rpx; color: #6b7d76; font-size: 27rpx; font-weight: 1000; text-align: center; }
|
|
||||||
.eg-weekly-row:nth-child(1) .eg-weekly-place { color: #dd7b17; font-size: 31rpx; }
|
|
||||||
.eg-weekly-avatar { display: flex; width: 52rpx; height: 52rpx; flex: 0 0 52rpx; align-items: center; justify-content: center; margin-left: 6rpx; border: 3rpx solid rgba(255,255,255,.9); border-radius: 50%; color: #fff; background: #5d9b84; box-shadow: 0 3rpx 9rpx rgba(30,78,61,.16); font-size: 24rpx; font-weight: 1000; }
|
|
||||||
.eg-weekly-avatar.is-tone-2 { background: #e39932; }
|
|
||||||
.eg-weekly-avatar.is-tone-3 { background: #6c83c8; }
|
|
||||||
.eg-weekly-avatar.is-tone-4 { background: #e5683e; }
|
|
||||||
.eg-weekly-avatar.is-tone-5 { background: #a673bd; }
|
|
||||||
.eg-weekly-avatar.is-tone-6 { background: #448e9c; }
|
|
||||||
.eg-weekly-avatar.is-tone-7 { background: #c27b49; }
|
|
||||||
.eg-weekly-name { flex: 1; margin-left: 13rpx; overflow: hidden; font-size: 27rpx; font-weight: 850; text-overflow: ellipsis; white-space: nowrap; }
|
|
||||||
.eg-weekly-me { margin-right: 8rpx; padding: 3rpx 9rpx; border-radius: 999rpx; color: #fff; background: #dd6b27; font-size: 18rpx; font-weight: 900; }
|
|
||||||
.eg-weekly-count { min-width: 70rpx; color: #315b4d; font-size: 29rpx; font-weight: 1000; text-align: right; }
|
|
||||||
.eg-cheer-card { margin-top: 16rpx; padding: 15rpx 17rpx 14rpx; border: 3rpx solid #f0d38d; border-radius: 23rpx; background: linear-gradient(135deg, #fff9d9, #fff1c2); }
|
|
||||||
.eg-cheer-card.is-family { border-color: #d9c8ef; background: linear-gradient(135deg, #f8f2ff, #efe7ff); }
|
|
||||||
.eg-cheer-card.is-bright { border-color: #f4c77b; background: linear-gradient(135deg, #fff8dc, #ffeec7); }
|
|
||||||
.eg-cheer-top { display: flex; align-items: center; justify-content: space-between; }
|
|
||||||
.eg-cheer-source { color: #8e5c18; font-size: 21rpx; font-weight: 900; }
|
|
||||||
.eg-cheer-card.is-family .eg-cheer-source { color: #77539c; }
|
|
||||||
.eg-cheer-change { padding: 5rpx 12rpx; border-radius: 999rpx; color: #176b52; background: rgba(255,255,255,.75); font-size: 19rpx; font-weight: 900; }
|
|
||||||
.eg-cheer-copy { display: block; margin-top: 7rpx; color: #55462d; font-size: 28rpx; font-weight: 900; line-height: 1.42; }
|
|
||||||
.eg-cheer-note { display: block; margin-top: 5rpx; color: #8d7c77; font-size: 18rpx; }
|
|
||||||
.eg-weekly-start { display: flex; height: 84rpx; align-items: center; justify-content: center; margin-top: 18rpx; border-radius: 24rpx; color: #fff; background: linear-gradient(135deg, #24906c, #12654a); box-shadow: 0 9rpx 20rpx rgba(18,101,74,.24); font-size: 30rpx; font-weight: 1000; }
|
|
||||||
.eg-weekly-footnote { display: block; margin-top: 10rpx; color: #8b8b7d; font-size: 18rpx; text-align: center; }
|
|
||||||
|
|
||||||
.eg-stage-overlay { position: fixed; z-index: 58; inset: 0; display: flex; align-items: center; justify-content: center; padding: 40rpx; background: rgba(22,62,50,.42); pointer-events: none; }
|
|
||||||
.eg-stage-card { width: 100%; max-width: 620rpx; padding: 34rpx 28rpx 30rpx; border: 6rpx solid #fff; border-radius: 38rpx; background: linear-gradient(155deg, #f5fff9, #fff8da); box-shadow: 0 26rpx 70rpx rgba(10,56,41,.3); text-align: center; animation: egStageIn 1.8s cubic-bezier(.16,.86,.28,1) both; }
|
|
||||||
.eg-stage-kicker { display: block; color: #16815f; font-size: 23rpx; font-weight: 900; letter-spacing: 3rpx; }
|
|
||||||
.eg-stage-number { display: block; margin-top: 5rpx; color: #e47722; font-size: 48rpx; font-weight: 1000; line-height: 1.1; }
|
|
||||||
.eg-stage-title { display: block; margin-top: 7rpx; color: #194e3d; font-size: 38rpx; font-weight: 900; }
|
|
||||||
.eg-stage-foods { display: flex; justify-content: center; gap: 9rpx; margin-top: 22rpx; }
|
|
||||||
.eg-stage-food { display: flex; width: 92rpx; min-height: 110rpx; flex-direction: column; align-items: center; justify-content: center; border: 3rpx solid #dbece4; border-radius: 20rpx; color: #315b4e; background: #fff; font-size: 20rpx; font-weight: 800; }
|
|
||||||
.eg-stage-food > image { width: 72rpx; height: 52rpx; border-radius: 12rpx; }
|
|
||||||
.eg-stage-food > text { margin-top: 8rpx; }
|
|
||||||
.eg-stage-food.is-danger { border-color: #ef8b52; color: #a43c20; background: #fff1e6; box-shadow: 0 0 0 4rpx rgba(239,139,82,.12); }
|
|
||||||
.eg-stage-tip { display: block; margin-top: 20rpx; color: #6e776d; font-size: 21rpx; font-weight: 700; }
|
|
||||||
.eg-reshuffle-overlay { position: fixed; z-index: 65; inset: 0; display: flex; align-items: center; justify-content: center; padding: 46rpx; background: rgba(19,55,45,.5); }
|
|
||||||
.eg-reshuffle-card { width: 100%; max-width: 540rpx; padding: 38rpx 30rpx; border: 5rpx solid rgba(255,255,255,.95); border-radius: 36rpx; background: linear-gradient(155deg, #f4fff9, #e6f6ef); box-shadow: 0 24rpx 64rpx rgba(10,48,37,.3); text-align: center; }
|
|
||||||
.eg-reshuffle-icon { display: flex; width: 94rpx; height: 94rpx; align-items: center; justify-content: center; margin: 0 auto 18rpx; border-radius: 50%; background: linear-gradient(135deg, #2aa87b, #126a50); box-shadow: 0 10rpx 24rpx rgba(18,106,80,.28); animation: egReshuffleSpin .85s linear infinite; }
|
|
||||||
.eg-reshuffle-title { display: block; color: #174e3d; font-size: 36rpx; font-weight: 900; }
|
|
||||||
.eg-reshuffle-desc { display: block; margin-top: 10rpx; color: #5b746b; font-size: 24rpx; font-weight: 700; }
|
|
||||||
|
|
||||||
.eg-overlay { position: fixed; z-index: 50; top: 0; right: 0; bottom: 0; left: 0; display: flex; align-items: center; justify-content: center; padding: 36rpx; background: rgba(20, 48, 40, .62); }
|
|
||||||
.eg-modal { width: 100%; max-width: 650rpx; padding: 34rpx 28rpx 28rpx; border-radius: 38rpx; background: #fffdf8; box-shadow: 0 28rpx 70rpx rgba(0,0,0,.22); }
|
|
||||||
.eg-modal-icon { display: block; font-size: 68rpx; text-align: center; }
|
|
||||||
.eg-modal-title { display: block; margin-top: 6rpx; color: #204e3d; font-size: 38rpx; font-weight: 900; text-align: center; }
|
|
||||||
.eg-modal-sub { display: block; margin: 8rpx 0 22rpx; color: #718078; font-size: 24rpx; text-align: center; }
|
|
||||||
.eg-result-warning { display: flex; width: 92rpx; height: 92rpx; align-items: center; justify-content: center; margin: 0 auto; border-radius: 50%; color: #fff; background: #e4572e; font-size: 60rpx; font-weight: 900; }
|
|
||||||
.eg-result-food { display: block; margin: 12rpx 0 18rpx; color: #c34b27; font-size: 28rpx; font-weight: 800; text-align: center; }
|
|
||||||
.eg-knowledge-card { padding: 22rpx; border-radius: 24rpx; background: #fff3e7; }
|
|
||||||
.eg-knowledge-title { display: block; color: #8d4427; font-size: 26rpx; font-weight: 800; }
|
|
||||||
.eg-knowledge-copy { display: block; margin-top: 9rpx; color: #5f514a; font-size: 23rpx; line-height: 1.65; }
|
|
||||||
.eg-knowledge-review { display: block; margin-top: 12rpx; color: #9b7768; font-size: 19rpx; }
|
|
||||||
.eg-result-score { display: flex; align-items: center; justify-content: space-between; margin: 20rpx 6rpx; color: #466258; font-size: 25rpx; }
|
|
||||||
.eg-result-score text:last-child { color: #e16f24; font-size: 36rpx; font-weight: 900; }
|
|
||||||
.eg-result-best { display: flex; align-items: center; justify-content: space-between; margin: -12rpx 6rpx 20rpx; color: #75867f; font-size: 22rpx; }
|
|
||||||
.eg-result-best text:last-child { color: #315d4e; font-size: 27rpx; font-weight: 900; }
|
|
||||||
.eg-primary-btn, .eg-secondary-btn { display: flex; height: 88rpx; align-items: center; justify-content: center; border-radius: 24rpx; font-size: 28rpx; font-weight: 800; }
|
|
||||||
.eg-primary-btn { color: #fff; background: linear-gradient(135deg, #238b68, #126649); box-shadow: 0 10rpx 22rpx rgba(18,102,73,.23); }
|
|
||||||
.eg-secondary-btn { margin-top: 12rpx; color: #45665b; background: #edf4f1; }
|
|
||||||
@keyframes egPulse {
|
|
||||||
0%, 100% { box-shadow: 0 0 0 0 rgba(245,158,11,.2); }
|
|
||||||
50% { box-shadow: 0 0 0 8rpx rgba(245,158,11,.12); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egWeeklyIn {
|
|
||||||
0% { opacity: 0; transform: translateY(34rpx) scale(.91); }
|
|
||||||
100% { opacity: 1; transform: translateY(0) scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egHit {
|
|
||||||
0% { opacity: 1; transform: scale(1); }
|
|
||||||
42% { opacity: 1; transform: scale(1.18) rotate(-3deg); }
|
|
||||||
100% { opacity: 0; transform: scale(.32) rotate(7deg); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egTaskRewardFlight {
|
|
||||||
0% { opacity: 0; transform: translate3d(-20rpx, 0, 0) scale(.62) rotate(-8deg); }
|
|
||||||
16% { opacity: 1; transform: translate3d(0, -24rpx, 0) scale(1.1) rotate(3deg); }
|
|
||||||
72% { opacity: 1; transform: translate3d(270rpx, 900rpx, 0) scale(.68) rotate(8deg); }
|
|
||||||
100% { opacity: 0; transform: translate3d(350rpx, 1205rpx, 0) scale(.3) rotate(2deg); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egRewardGlow {
|
|
||||||
from { opacity: .4; transform: scale(.86); }
|
|
||||||
to { opacity: .9; transform: scale(1.12); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFireSweep {
|
|
||||||
0% { opacity: 0; transform: translate3d(-38%, 20rpx, 0) scaleX(.6); }
|
|
||||||
28% { opacity: 1; }
|
|
||||||
72% { opacity: .96; }
|
|
||||||
100% { opacity: 0; transform: translate3d(58%, -15rpx, 0) scaleX(1.08); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFireSpark {
|
|
||||||
0% { opacity: 0; transform: translateY(14rpx) scale(.5) rotate(35deg); }
|
|
||||||
38% { opacity: 1; }
|
|
||||||
100% { opacity: 0; transform: translateY(-38rpx) scale(1.05) rotate(58deg); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFireGlow {
|
|
||||||
0% { opacity: 0; transform: scale(.72); }
|
|
||||||
38% { opacity: 1; transform: scale(1.08); }
|
|
||||||
100% { opacity: 0; transform: scale(1.28); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFireCellHit {
|
|
||||||
0% { opacity: 1; transform: scale(1); }
|
|
||||||
24% { opacity: 1; transform: scale(1.09); }
|
|
||||||
72% { opacity: 1; transform: scale(1.02); }
|
|
||||||
100% { opacity: 0; transform: scale(.48); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFireFlame {
|
|
||||||
0% { opacity: 0; transform: translateY(20rpx) rotate(42deg) scale(.55); }
|
|
||||||
38% { opacity: 1; transform: translateY(0) rotate(42deg) scale(1.05); }
|
|
||||||
100% { opacity: 0; transform: translateY(-31rpx) rotate(48deg) scale(.86); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFlameReady {
|
|
||||||
from { transform: scale(.94); filter: brightness(.96); }
|
|
||||||
to { transform: scale(1.08); filter: brightness(1.18); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egLReady {
|
|
||||||
from { transform: scale(.94) rotate(-2deg); filter: brightness(.96); }
|
|
||||||
to { transform: scale(1.06) rotate(2deg); filter: brightness(1.12); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egImpact {
|
|
||||||
0% { opacity: 0; transform: translate(-50%, -42%) scale(.55); }
|
|
||||||
35% { opacity: 1; transform: translate(-50%, -50%) scale(1.16); }
|
|
||||||
72% { opacity: 1; transform: translate(-50%, -54%) scale(1); }
|
|
||||||
100% { opacity: 0; transform: translate(-50%, -76%) scale(.92); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egJackpotIn {
|
|
||||||
0% { opacity: 0; transform: translate(-50%, -45%) scale(.48) rotate(-4deg); }
|
|
||||||
20% { opacity: 1; transform: translate(-50%, -50%) scale(1.09) rotate(2deg); }
|
|
||||||
31% { transform: translate(-50%, -50%) scale(.98) rotate(0); }
|
|
||||||
78% { opacity: 1; transform: translate(-50%, -53%) scale(1); }
|
|
||||||
100% { opacity: 0; transform: translate(-50%, -68%) scale(.92); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egTripleIn {
|
|
||||||
0% { opacity: 0; transform: translate(-50%, -44%) scale(.82); }
|
|
||||||
20% { opacity: 1; transform: translate(-50%, -50%) scale(1.03); }
|
|
||||||
74% { opacity: 1; transform: translate(-50%, -52%) scale(1); }
|
|
||||||
100% { opacity: 0; transform: translate(-50%, -60%) scale(.96); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egTripleCan {
|
|
||||||
0% { opacity: 0; transform: translateY(18rpx) scale(.72); }
|
|
||||||
100% { opacity: 1; transform: translateY(0) scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFourIn {
|
|
||||||
0% { opacity: 0; transform: translate(-50%, -44%) scale(.62) rotate(-3deg); }
|
|
||||||
18% { opacity: 1; transform: translate(-50%, -50%) scale(1.08) rotate(1deg); }
|
|
||||||
29% { transform: translate(-50%, -50%) scale(.98) rotate(0); }
|
|
||||||
78% { opacity: 1; transform: translate(-50%, -52%) scale(1); }
|
|
||||||
100% { opacity: 0; transform: translate(-50%, -65%) scale(.94); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFourCan {
|
|
||||||
0% { opacity: 0; transform: translateY(-22rpx) rotate(-7deg) scale(.65); }
|
|
||||||
75% { opacity: 1; transform: translateY(5rpx) rotate(2deg) scale(1.05); }
|
|
||||||
100% { opacity: 1; transform: translateY(0) rotate(0) scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egFiveCan {
|
|
||||||
0% { opacity: 0; transform: translateY(-40rpx) scale(.52) rotate(-8deg); filter: brightness(1.5); }
|
|
||||||
70% { opacity: 1; transform: translateY(7rpx) scale(1.08) rotate(2deg); }
|
|
||||||
100% { opacity: 1; transform: translateY(0) scale(1) rotate(0); filter: brightness(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egLockedCan {
|
|
||||||
from { opacity: .62; transform: scale(.92); filter: brightness(.9); }
|
|
||||||
to { opacity: 1; transform: scale(1.06); filter: brightness(1.2); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egPromisePulse {
|
|
||||||
from { transform: scale(.97); box-shadow: 0 5rpx 15rpx rgba(28,7,62,.22); }
|
|
||||||
to { transform: scale(1.03); box-shadow: 0 7rpx 21rpx rgba(255,221,89,.38); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egReelStop {
|
|
||||||
0% { opacity: .2; transform: translateY(-48rpx) scaleY(1.4); filter: blur(5rpx); }
|
|
||||||
70% { opacity: 1; transform: translateY(7rpx) scaleY(.94); filter: blur(0); }
|
|
||||||
100% { transform: translateY(0) scaleY(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egLights {
|
|
||||||
0% { opacity: .35; }
|
|
||||||
100% { opacity: 1; }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egConfettiFall {
|
|
||||||
0% { opacity: 0; transform: translate3d(0, -8vh, 0) rotate(0deg) scale(.7); }
|
|
||||||
9% { opacity: 1; }
|
|
||||||
48% { transform: translate3d(42rpx, 48vh, 0) rotate(420deg) scale(1); }
|
|
||||||
100% { opacity: .92; transform: translate3d(-28rpx, 112vh, 0) rotate(920deg) scale(.86); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egPointsPop {
|
|
||||||
0% { opacity: 0; transform: scale(.35) rotate(-7deg); }
|
|
||||||
55% { opacity: 1; transform: scale(1.28) rotate(3deg); }
|
|
||||||
78% { transform: scale(.92) rotate(0); }
|
|
||||||
100% { opacity: 1; transform: scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egStageIn {
|
|
||||||
0% { opacity: 0; transform: scale(.7) translateY(34rpx); }
|
|
||||||
18% { opacity: 1; transform: scale(1.06) translateY(0); }
|
|
||||||
30%, 76% { opacity: 1; transform: scale(1); }
|
|
||||||
100% { opacity: 0; transform: scale(.96) translateY(-22rpx); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes egReshuffleSpin {
|
|
||||||
from { transform: rotate(0); }
|
|
||||||
to { transform: rotate(360deg); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-height: 760px) {
|
|
||||||
.eg-task-card { padding-top: 13rpx; padding-bottom: 13rpx; }
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -98,27 +98,15 @@
|
|||||||
<view v-if="chartUseMockData" class="st-chart-foot">
|
<view v-if="chartUseMockData" class="st-chart-foot">
|
||||||
<text class="st-chart-mock-hint">示例数据，累计记录满 7 天后显示您的真实趋势</text>
|
<text class="st-chart-mock-hint">示例数据，累计记录满 7 天后显示您的真实趋势</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="st-game-entry-list">
|
<view class="st-game-entry st-game-entry--in-card" @click="goGamePage" style="margin: 0 20rpx 0 20rpx;">
|
||||||
<view class="st-game-entry st-game-entry--in-card" @click="goSugarRaidGamePage">
|
<view class="st-game-entry-icon">
|
||||||
<view class="st-game-entry-icon">
|
<TongjiIcon name="activity" size="sm" color="#006c49" />
|
||||||
<TongjiIcon name="activity" size="sm" color="#006c49" />
|
|
||||||
</view>
|
|
||||||
<view class="st-game-entry-body">
|
|
||||||
<text class="st-game-entry-title">识糖小课堂</text>
|
|
||||||
<text class="st-game-entry-sub">认一认：哪些食物含糖高</text>
|
|
||||||
</view>
|
|
||||||
<TongjiIcon name="chevron-right" size="sm" color="#64748b" />
|
|
||||||
</view>
|
</view>
|
||||||
<view class="st-game-entry st-game-entry--in-card" @click="goEndlessGamePage">
|
<view class="st-game-entry-body">
|
||||||
<view class="st-game-entry-icon">
|
<text class="st-game-entry-title">识糖小课堂</text>
|
||||||
<TongjiIcon name="sparkles" size="sm" color="#006c49" />
|
<text class="st-game-entry-sub">认一认：哪些食物含糖高</text>
|
||||||
</view>
|
|
||||||
<view class="st-game-entry-body">
|
|
||||||
<text class="st-game-entry-title">控糖消消乐</text>
|
|
||||||
<text class="st-game-entry-sub">无尽消除，挑战控糖高分</text>
|
|
||||||
</view>
|
|
||||||
<TongjiIcon name="chevron-right" size="sm" color="#64748b" />
|
|
||||||
</view>
|
</view>
|
||||||
|
<TongjiIcon name="chevron-right" size="sm" color="#64748b" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="st-training-section">
|
<view class="st-training-section">
|
||||||
@@ -1524,23 +1512,15 @@ async function goMorePage() {
|
|||||||
uni.navigateTo({ url: buildMorePageUrl() })
|
uni.navigateTo({ url: buildMorePageUrl() })
|
||||||
}
|
}
|
||||||
|
|
||||||
function openGamePage(url) {
|
function goGamePage() {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url,
|
url: '/tongji/pages/game',
|
||||||
fail() {
|
fail() {
|
||||||
uni.showToast({ title: '暂时无法打开游戏', icon: 'none' })
|
uni.showToast({ title: '暂时无法打开游戏', icon: 'none' })
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function goSugarRaidGamePage() {
|
|
||||||
openGamePage('/tongji/pages/game')
|
|
||||||
}
|
|
||||||
|
|
||||||
function goEndlessGamePage() {
|
|
||||||
openGamePage('/tongji/endless-game/index')
|
|
||||||
}
|
|
||||||
|
|
||||||
function navToUser() {
|
function navToUser() {
|
||||||
uni.redirectTo({ url: '/pages/user/user' })
|
uni.redirectTo({ url: '/pages/user/user' })
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,7 +177,7 @@
|
|||||||
transform: scale(0.98);
|
transform: scale(0.98);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 游戏入口 */
|
/* 糖分突袭游戏入口 */
|
||||||
.weekly-page .st-game-entry {
|
.weekly-page .st-game-entry {
|
||||||
|
|
||||||
margin-top: 24rpx;
|
margin-top: 24rpx;
|
||||||
@@ -388,15 +388,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* 识糖入口嵌在趋势卡内：轻量分隔，避免大块留白 */
|
/* 识糖入口嵌在趋势卡内：轻量分隔，避免大块留白 */
|
||||||
.weekly-page .st-chart-card .st-game-entry-list {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 12rpx;
|
|
||||||
margin: 12rpx 20rpx 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weekly-page .st-chart-card .st-game-entry--in-card {
|
.weekly-page .st-chart-card .st-game-entry--in-card {
|
||||||
margin-top: 0;
|
margin-top: 12rpx;
|
||||||
padding: 16rpx 20rpx;
|
padding: 16rpx 20rpx;
|
||||||
gap: 16rpx;
|
gap: 16rpx;
|
||||||
border-radius: 24rpx;
|
border-radius: 24rpx;
|
||||||
|
|||||||
+1
-284
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB |
@@ -0,0 +1,158 @@
|
|||||||
|
/**
|
||||||
|
* 将标准双 el-card 列表页迁移为 admin-page 架构组件
|
||||||
|
* 用法: node scripts/migrate-admin-pages.mjs [--dry-run] [glob...]
|
||||||
|
*/
|
||||||
|
import fs from 'node:fs'
|
||||||
|
import path from 'node:path'
|
||||||
|
import { fileURLToPath } from 'node:url'
|
||||||
|
|
||||||
|
const __dirname = path.dirname(fileURLToPath(import.meta.url))
|
||||||
|
const viewsRoot = path.join(__dirname, '../src/views')
|
||||||
|
|
||||||
|
const dryRun = process.argv.includes('--dry-run')
|
||||||
|
const extraPaths = process.argv.slice(2).filter((a) => !a.startsWith('--'))
|
||||||
|
|
||||||
|
const defaultTargets = [
|
||||||
|
'article/lists/index.vue',
|
||||||
|
'article/column/index.vue',
|
||||||
|
'permission/role/index.vue',
|
||||||
|
'permission/menu/index.vue',
|
||||||
|
'dev_tools/code/index.vue',
|
||||||
|
'setting/dict/type/index.vue',
|
||||||
|
'setting/dict/data/index.vue',
|
||||||
|
'message/notice/index.vue',
|
||||||
|
'message/short_letter/index.vue',
|
||||||
|
'fans/index.vue',
|
||||||
|
'order/index.vue',
|
||||||
|
'asset/user/index.vue',
|
||||||
|
'asset/resource/index.vue',
|
||||||
|
'finance/balance_details.vue',
|
||||||
|
'finance/recharge_record.vue',
|
||||||
|
'finance/refund_record.vue'
|
||||||
|
]
|
||||||
|
|
||||||
|
function migrate(content) {
|
||||||
|
if (content.includes('admin-page-filter-panel')) return null
|
||||||
|
if (!content.includes('el-card class="!border-none"')) return null
|
||||||
|
if (!content.includes('<el-table')) return null
|
||||||
|
|
||||||
|
let out = content
|
||||||
|
|
||||||
|
// 根容器 class 清理
|
||||||
|
out = out.replace(
|
||||||
|
/<div class="[^"]*">\s*\n\s*<el-card class="!border-none" shadow="never">/,
|
||||||
|
'<div>\n <admin-page-filter-panel>'
|
||||||
|
)
|
||||||
|
if (!out.includes('admin-page-filter-panel')) {
|
||||||
|
out = out.replace(
|
||||||
|
/<el-card class="!border-none" shadow="never">/,
|
||||||
|
'<admin-page-filter-panel>'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 第一个 filter card 结束
|
||||||
|
out = out.replace(
|
||||||
|
/<\/el-form>\s*\n\s*<\/el-card>/,
|
||||||
|
'</el-form>\n </admin-page-filter-panel>'
|
||||||
|
)
|
||||||
|
|
||||||
|
// 第二个 data card 开始 - 提取 v-loading
|
||||||
|
const loadingMatch = out.match(
|
||||||
|
/<el-card([^>]*?)class="[^"]*mt-4[^"]*"[^>]*shadow="never"[^>]*>/
|
||||||
|
)
|
||||||
|
const altLoadingMatch = out.match(
|
||||||
|
/<el-card v-loading="([^"]+)"([^>]*)class="[^"]*mt-4[^"]*"([^>]*)shadow="never"([^>]*)>/
|
||||||
|
)
|
||||||
|
|
||||||
|
if (altLoadingMatch) {
|
||||||
|
out = out.replace(
|
||||||
|
altLoadingMatch[0],
|
||||||
|
`<admin-page-data-panel v-loading="${altLoadingMatch[1]}">`
|
||||||
|
)
|
||||||
|
} else if (loadingMatch) {
|
||||||
|
out = out.replace(loadingMatch[0], '<admin-page-data-panel>')
|
||||||
|
} else {
|
||||||
|
out = out.replace(
|
||||||
|
/<el-card class="!border-none mt-4" shadow="never">/,
|
||||||
|
'<admin-page-data-panel>'
|
||||||
|
)
|
||||||
|
out = out.replace(
|
||||||
|
/<el-card v-loading="([^"]+)" class="mt-4 !border-none" shadow="never">/,
|
||||||
|
'<admin-page-data-panel v-loading="$1">'
|
||||||
|
)
|
||||||
|
out = out.replace(
|
||||||
|
/<el-card v-loading="([^"]+)" class="!border-none mt-4" shadow="never">/,
|
||||||
|
'<admin-page-data-panel v-loading="$1">'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// toolbar: 紧跟 data panel 后的首个 div 包裹按钮
|
||||||
|
out = out.replace(
|
||||||
|
/(<admin-page-data-panel[^>]*>\s*)<div>\s*\n(\s*<el-button[\s\S]*?<\/div>\s*\n)/,
|
||||||
|
'$1<template #toolbar>\n$2</template>\n'
|
||||||
|
)
|
||||||
|
out = out.replace(
|
||||||
|
/(<admin-page-data-panel[^>]*>\s*)<div>\s*\n(\s*<router-link[\s\S]*?<\/div>\s*\n)/,
|
||||||
|
'$1<template #toolbar>\n$2</template>\n'
|
||||||
|
)
|
||||||
|
|
||||||
|
// 移除 table 前的 mt-4 class
|
||||||
|
out = out.replace(/<el-table class="mt-4"/g, '<el-table')
|
||||||
|
out = out.replace(/<el-table\s+class="mt-4"\s+/g, '<el-table ')
|
||||||
|
|
||||||
|
// pagination footer
|
||||||
|
out = out.replace(
|
||||||
|
/<div class="flex(?: mt-4)? justify-end(?: mt-4)?">\s*\n\s*<pagination([^/]*)\/>\s*\n\s*<\/div>\s*\n\s*<\/el-card>/,
|
||||||
|
'<template #footer>\n <pagination$1/>\n </template>\n </admin-page-data-panel>'
|
||||||
|
)
|
||||||
|
out = out.replace(
|
||||||
|
/<div class="flex mt-4 justify-end">\s*\n\s*<pagination([^/]*)\/>\s*\n\s*<\/div>\s*\n\s*<\/el-card>/,
|
||||||
|
'<template #footer>\n <pagination$1/>\n </template>\n </admin-page-data-panel>'
|
||||||
|
)
|
||||||
|
|
||||||
|
// 无 pagination 的 data card 闭合
|
||||||
|
if (out.includes('<admin-page-data-panel') && out.includes('</el-card>')) {
|
||||||
|
out = out.replace(/<\/el-table>\s*\n\s*<\/el-card>/, '</el-table>\n </admin-page-data-panel>')
|
||||||
|
}
|
||||||
|
|
||||||
|
// table 上的 v-loading 移到 panel（若 panel 还没有）
|
||||||
|
out = out.replace(
|
||||||
|
/<admin-page-data-panel>\s*\n(\s*)<el-table([^>]*?)v-loading="([^"]+)"([^>]*)>/,
|
||||||
|
'<admin-page-data-panel v-loading="$3">\n$1<el-table$2$4>'
|
||||||
|
)
|
||||||
|
out = out.replace(/<el-table([^>]*?)v-loading="([^"]+)"([^>]*)>/, '<el-table$1$3>')
|
||||||
|
|
||||||
|
if (out === content || !out.includes('admin-page-data-panel')) return null
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
const targets = extraPaths.length
|
||||||
|
? extraPaths.map((p) => path.resolve(p))
|
||||||
|
: defaultTargets.map((p) => path.join(viewsRoot, p))
|
||||||
|
|
||||||
|
let migrated = 0
|
||||||
|
let skipped = 0
|
||||||
|
|
||||||
|
for (const file of targets) {
|
||||||
|
if (!fs.existsSync(file)) {
|
||||||
|
console.warn('skip (missing):', path.relative(viewsRoot, file))
|
||||||
|
skipped++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const original = fs.readFileSync(file, 'utf8')
|
||||||
|
const result = migrate(original)
|
||||||
|
if (!result) {
|
||||||
|
console.log('skip (no match):', path.relative(viewsRoot, file))
|
||||||
|
skipped++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (dryRun) {
|
||||||
|
console.log('would migrate:', path.relative(viewsRoot, file))
|
||||||
|
} else {
|
||||||
|
fs.writeFileSync(file, result, 'utf8')
|
||||||
|
console.log('migrated:', path.relative(viewsRoot, file))
|
||||||
|
}
|
||||||
|
migrated++
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`\nDone. migrated=${migrated} skipped=${skipped}${dryRun ? ' (dry-run)' : ''}`)
|
||||||
@@ -227,16 +227,6 @@ export function revisitRateVisitOrderLines(params: {
|
|||||||
return request.get({ url: '/stats.revisitRate/visitOrderLines', params })
|
return request.get({ url: '/stats.revisitRate/visitOrderLines', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 待分配诊单自动指派日志列表（定时命令 tcm:auto-assign-pending 写入，含分配/未分配原因） */
|
|
||||||
export function autoAssignLogLists(params: Record<string, any>) {
|
|
||||||
return request.get({ url: '/stats.autoAssignLog/lists', params })
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 批量回退自动分配：将诊单医助撤回到自动分配前的原医助 */
|
|
||||||
export function autoAssignLogRollback(data: { ids: number[] }) {
|
|
||||||
return request.post({ url: '/stats.autoAssignLog/rollback', data })
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 医助个人业绩概览 */
|
/** 医助个人业绩概览 */
|
||||||
export function assistantPerformanceOverview(params: {
|
export function assistantPerformanceOverview(params: {
|
||||||
time_type?: string
|
time_type?: string
|
||||||
|
|||||||
@@ -61,14 +61,6 @@ export function tcmDiagnosisDetail(params: any) {
|
|||||||
return request.get({ url: '/tcm.diagnosis/detail', params })
|
return request.get({ url: '/tcm.diagnosis/detail', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 设置复诊接诊率统计起始偏移（统计诊次=实单序号+偏移；1=二诊起，2=三诊起） */
|
|
||||||
export function tcmDiagnosisSetRevisitSlotStartOffset(params: {
|
|
||||||
id: number
|
|
||||||
revisit_slot_start_offset: number
|
|
||||||
}) {
|
|
||||||
return request.post({ url: '/tcm.diagnosis/setRevisitSlotStartOffset', params })
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 诊单挂号 / 取消挂号 操作日志 */
|
/** 诊单挂号 / 取消挂号 操作日志 */
|
||||||
export function tcmDiagnosisGuahaoLogList(params: { id: number }) {
|
export function tcmDiagnosisGuahaoLogList(params: { id: number }) {
|
||||||
return request.get({ url: '/tcm.diagnosis/guahaoLogList', params })
|
return request.get({ url: '/tcm.diagnosis/guahaoLogList', params })
|
||||||
@@ -433,17 +425,6 @@ export function prescriptionOrderPatchPrescriptionPatient(params: {
|
|||||||
return request.post({ url: '/tcm.prescriptionOrder/patchPrescriptionPatient', params })
|
return request.post({ url: '/tcm.prescriptionOrder/patchPrescriptionPatient', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
export function prescriptionOrderPatchPrescriptionUsage(params: {
|
|
||||||
id: number
|
|
||||||
times_per_day: number
|
|
||||||
usage_days: number
|
|
||||||
medication_days: number
|
|
||||||
aux_times_per_day?: number
|
|
||||||
aux_usage_days?: number
|
|
||||||
}) {
|
|
||||||
return request.post({ url: '/tcm.prescriptionOrder/patchPrescriptionUsage', params })
|
|
||||||
}
|
|
||||||
|
|
||||||
export function prescriptionOrderAuditPrescription(params: {
|
export function prescriptionOrderAuditPrescription(params: {
|
||||||
id: number
|
id: number
|
||||||
action: 'approve' | 'reject'
|
action: 'approve' | 'reject'
|
||||||
@@ -542,18 +523,6 @@ export function prescriptionOrderLogs(params: { id: number }) {
|
|||||||
return request.get({ url: '/tcm.prescriptionOrder/logs', params })
|
return request.get({ url: '/tcm.prescriptionOrder/logs', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 手工新增操作日志（可选调整处方/支付单审核状态） */
|
|
||||||
export function prescriptionOrderAddLog(params: {
|
|
||||||
id: number
|
|
||||||
summary: string
|
|
||||||
prescription_audit_status?: number | ''
|
|
||||||
payment_slip_audit_status?: number | ''
|
|
||||||
prescription_audit_remark?: string
|
|
||||||
payment_slip_audit_remark?: string
|
|
||||||
}) {
|
|
||||||
return request.post({ url: '/tcm.prescriptionOrder/addLog', params })
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 修改订单金额 */
|
/** 修改订单金额 */
|
||||||
export function prescriptionOrderUpdateAmount(params: { id: number; amount: number }) {
|
export function prescriptionOrderUpdateAmount(params: { id: number; amount: number }) {
|
||||||
return request.post({ url: '/tcm.prescriptionOrder/updateAmount', params })
|
return request.post({ url: '/tcm.prescriptionOrder/updateAmount', params })
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<template>
|
||||||
|
<section class="admin-data-panel" v-loading="loading">
|
||||||
|
<div v-if="$slots.toolbar" class="admin-data-panel__toolbar">
|
||||||
|
<slot name="toolbar" />
|
||||||
|
</div>
|
||||||
|
<div class="admin-data-panel__body">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
<div v-if="$slots.footer" class="admin-data-panel__footer">
|
||||||
|
<slot name="footer" />
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
loading?: boolean
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
loading: false
|
||||||
|
}
|
||||||
|
)
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
<template>
|
||||||
|
|
||||||
|
<section class="admin-filter-panel" :class="{ 'is-collapsed': collapsed }">
|
||||||
|
|
||||||
|
<div v-if="collapsible" class="admin-filter-panel__head">
|
||||||
|
|
||||||
|
<span class="admin-filter-panel__label">{{ title }}</span>
|
||||||
|
|
||||||
|
<el-button class="admin-filter-panel__toggle" link type="primary" @click="collapsed = !collapsed">
|
||||||
|
|
||||||
|
{{ collapsed ? '展开筛选' : '收起筛选' }}
|
||||||
|
|
||||||
|
</el-button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="admin-filter-panel__body">
|
||||||
|
|
||||||
|
<slot />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
withDefaults(
|
||||||
|
|
||||||
|
defineProps<{
|
||||||
|
|
||||||
|
/** 是否显示收起/展开 */
|
||||||
|
|
||||||
|
collapsible?: boolean
|
||||||
|
|
||||||
|
/** 筛选区标题 */
|
||||||
|
|
||||||
|
title?: string
|
||||||
|
|
||||||
|
}>(),
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
collapsible: true,
|
||||||
|
|
||||||
|
title: '筛选条件'
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const collapsed = ref(false)
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<template>
|
||||||
|
<section class="admin-form-panel">
|
||||||
|
<header v-if="title || $slots.header" class="admin-form-panel__header">
|
||||||
|
<slot name="header">
|
||||||
|
<h2 v-if="title" class="admin-form-panel__title">{{ title }}</h2>
|
||||||
|
</slot>
|
||||||
|
</header>
|
||||||
|
<div class="admin-form-panel__body">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
<footer v-if="$slots.footer" class="admin-form-panel__footer">
|
||||||
|
<slot name="footer" />
|
||||||
|
</footer>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
defineProps({
|
||||||
|
title: {
|
||||||
|
type: String,
|
||||||
|
default: ''
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<template>
|
||||||
|
<div class="admin-page-actions">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<template>
|
||||||
|
<div class="admin-stat-grid" :class="[`admin-stat-grid--cols-${columns}`]">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
columns?: 2 | 3 | 4 | 5
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
columns: 4
|
||||||
|
}
|
||||||
|
)
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<template>
|
||||||
|
<article class="admin-stat-item" :class="[`admin-stat-item--${tone}`]">
|
||||||
|
<div class="admin-stat-item__label">{{ label }}</div>
|
||||||
|
<div class="admin-stat-item__value" :class="{ 'is-money': money }">
|
||||||
|
<slot>{{ value }}</slot>
|
||||||
|
</div>
|
||||||
|
<p v-if="hint" class="admin-stat-item__hint">{{ hint }}</p>
|
||||||
|
</article>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
label: string
|
||||||
|
value?: string | number
|
||||||
|
hint?: string
|
||||||
|
money?: boolean
|
||||||
|
tone?: 'default' | 'primary' | 'success' | 'warning'
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
value: '',
|
||||||
|
hint: '',
|
||||||
|
money: false,
|
||||||
|
tone: 'default'
|
||||||
|
}
|
||||||
|
)
|
||||||
|
</script>
|
||||||
@@ -17,14 +17,18 @@ defineProps({
|
|||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.footer-btns {
|
.footer-btns {
|
||||||
height: 60px;
|
height: 64px;
|
||||||
|
|
||||||
&__content {
|
&__content {
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
height: 60px;
|
height: 64px;
|
||||||
right: 0;
|
right: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
@apply flex justify-center items-center shadow bg-body;
|
padding: 0 20px;
|
||||||
|
border-top: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: 0 -4px 16px rgba(15, 23, 42, 0.04);
|
||||||
|
@apply flex justify-center items-center gap-3 bg-body;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,228 @@
|
|||||||
|
<template>
|
||||||
|
|
||||||
|
<div class="page-stage admin-page" :class="{ 'page-stage--flat': hideChrome }">
|
||||||
|
|
||||||
|
<header v-if="showHeader" class="page-stage__hero">
|
||||||
|
|
||||||
|
<div class="page-stage__hero-glow" aria-hidden="true"></div>
|
||||||
|
|
||||||
|
<div class="page-stage__hero-inner">
|
||||||
|
|
||||||
|
<div class="page-stage__intro">
|
||||||
|
|
||||||
|
<h1 class="page-stage__title">{{ pageTitle }}</h1>
|
||||||
|
|
||||||
|
<p v-if="pageDesc" class="page-stage__desc">{{ pageDesc }}</p>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="$slots.actions" class="page-stage__actions">
|
||||||
|
|
||||||
|
<slot name="actions" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="page-stage__body">
|
||||||
|
|
||||||
|
<slot />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import { PageEnum } from '@/enums/pageEnum'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const hideChrome = computed(() => {
|
||||||
|
|
||||||
|
if (route.meta?.hidePageHeader) return true
|
||||||
|
|
||||||
|
if (route.path === PageEnum.INDEX || route.path === `${PageEnum.INDEX}/`) return true
|
||||||
|
|
||||||
|
const title = (route.meta?.title as string) || ''
|
||||||
|
|
||||||
|
return title.includes('工作台')
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const pageTitle = computed(() => {
|
||||||
|
|
||||||
|
const matched = route.matched.filter((item) => item.meta?.title)
|
||||||
|
|
||||||
|
const last = matched[matched.length - 1]
|
||||||
|
|
||||||
|
return (last?.meta?.title as string) || ''
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const pageDesc = computed(() => (route.meta?.pageDesc as string) || '')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const showHeader = computed(() => !hideChrome.value && Boolean(pageTitle.value))
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
|
.page-stage {
|
||||||
|
|
||||||
|
min-height: 100%;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__hero {
|
||||||
|
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
margin-bottom: 20px;
|
||||||
|
|
||||||
|
padding: 22px 24px;
|
||||||
|
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
|
||||||
|
background: var(--admin-surface-glass);
|
||||||
|
|
||||||
|
backdrop-filter: blur(16px) saturate(140%);
|
||||||
|
|
||||||
|
box-shadow: var(--el-box-shadow-light);
|
||||||
|
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__hero-glow {
|
||||||
|
|
||||||
|
position: absolute;
|
||||||
|
|
||||||
|
inset: 0;
|
||||||
|
|
||||||
|
background:
|
||||||
|
|
||||||
|
linear-gradient(120deg, rgba(6, 182, 212, 0.12) 0%, transparent 42%),
|
||||||
|
|
||||||
|
linear-gradient(300deg, rgba(16, 185, 129, 0.1) 0%, transparent 38%);
|
||||||
|
|
||||||
|
pointer-events: none;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__hero-inner {
|
||||||
|
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
|
||||||
|
flex-wrap: wrap;
|
||||||
|
|
||||||
|
align-items: flex-start;
|
||||||
|
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
gap: 12px 20px;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__title {
|
||||||
|
|
||||||
|
margin: 0;
|
||||||
|
|
||||||
|
font-size: 24px;
|
||||||
|
|
||||||
|
font-weight: 800;
|
||||||
|
|
||||||
|
line-height: 1.2;
|
||||||
|
|
||||||
|
letter-spacing: -0.03em;
|
||||||
|
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
|
||||||
|
background-clip: text;
|
||||||
|
|
||||||
|
-webkit-background-clip: text;
|
||||||
|
|
||||||
|
-webkit-text-fill-color: transparent;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__desc {
|
||||||
|
|
||||||
|
margin: 8px 0 0;
|
||||||
|
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
line-height: 1.5;
|
||||||
|
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
|
||||||
|
max-width: 62ch;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__actions {
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
|
||||||
|
flex-wrap: wrap;
|
||||||
|
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
gap: 8px;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage__body {
|
||||||
|
|
||||||
|
min-width: 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.page-stage--flat .page-stage__hero {
|
||||||
|
|
||||||
|
display: none;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
|
||||||
+20
-20
@@ -1,28 +1,28 @@
|
|||||||
const defaultSetting = {
|
const defaultSetting = {
|
||||||
showCrumb: true, // 是否显示面包屑
|
showCrumb: false,
|
||||||
showLogo: false, // 是否显示logo
|
showLogo: true,
|
||||||
isUniqueOpened: true, //只展开一个一级菜单
|
isUniqueOpened: true,
|
||||||
sideWidth: 183, //侧边栏宽度
|
sideWidth: 248,
|
||||||
sideTheme: 'dark', //侧边栏主题
|
sideTheme: 'dark',
|
||||||
sideDarkColor: '#1d2124', //侧边栏深色主题颜色
|
sideDarkColor: '#060d18',
|
||||||
openMultipleTabs: true, // 是否开启多标签tab栏
|
openMultipleTabs: true,
|
||||||
theme: '#4A5DFF', //主题色
|
theme: '#06b6d4',
|
||||||
successTheme: '#67c23a', //成功主题色
|
successTheme: '#10b981',
|
||||||
warningTheme: '#e6a23c', //警告主题色
|
warningTheme: '#f59e0b',
|
||||||
dangerTheme: '#f56c6c', //危险主题色
|
dangerTheme: '#ef4444',
|
||||||
errorTheme: '#f56c6c', //错误主题色
|
errorTheme: '#ef4444',
|
||||||
infoTheme: '#909399' //信息主题色
|
infoTheme: '#6366f1'
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 本地 setting 缓存结构版本。提升后仅对低于该版本的老缓存执行 SETTING_SCHEMA_MIGRATIONS */
|
export const SETTING_SCHEMA_VERSION = 6
|
||||||
export const SETTING_SCHEMA_VERSION = 1
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 按版本写入 defaultSetting 中的键（老用户 localStorage 会长期盖住 config 默认值）。
|
|
||||||
* 以后若要再推一批新默认值：把 SETTING_SCHEMA_VERSION +1，并为本版本追加一条迁移键列表。
|
|
||||||
*/
|
|
||||||
export const SETTING_SCHEMA_MIGRATIONS: Record<number, (keyof typeof defaultSetting)[]> = {
|
export const SETTING_SCHEMA_MIGRATIONS: Record<number, (keyof typeof defaultSetting)[]> = {
|
||||||
1: ['sideTheme', 'sideDarkColor']
|
1: ['sideTheme', 'sideDarkColor'],
|
||||||
|
2: ['theme', 'successTheme', 'warningTheme', 'dangerTheme', 'errorTheme', 'infoTheme', 'sideDarkColor', 'sideWidth', 'showLogo'],
|
||||||
|
3: ['theme', 'sideDarkColor', 'sideWidth', 'showCrumb', 'showLogo'],
|
||||||
|
4: ['theme', 'successTheme', 'warningTheme', 'dangerTheme', 'errorTheme', 'infoTheme', 'sideDarkColor'],
|
||||||
|
5: ['theme', 'successTheme', 'warningTheme', 'dangerTheme', 'errorTheme', 'infoTheme', 'sideDarkColor'],
|
||||||
|
6: ['theme', 'successTheme', 'warningTheme', 'dangerTheme', 'errorTheme', 'infoTheme', 'sideDarkColor', 'sideWidth']
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defaultSetting
|
export default defaultSetting
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-breadcrumb class="app-breadcrumb">
|
<el-breadcrumb class="app-breadcrumb" separator="/">
|
||||||
<el-breadcrumb-item v-for="item in breadcrumbs" :key="item.path">
|
<el-breadcrumb-item v-for="item in breadcrumbs" :key="item.path">
|
||||||
{{ item.meta.title }}
|
{{ item.meta.title }}
|
||||||
</el-breadcrumb-item>
|
</el-breadcrumb-item>
|
||||||
@@ -21,22 +21,24 @@ useWatchRoute((route) => {
|
|||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.app-breadcrumb {
|
.app-breadcrumb {
|
||||||
:deep(.el-breadcrumb__item) {
|
:deep(.el-breadcrumb__item) {
|
||||||
.el-breadcrumb__inner {
|
.el-breadcrumb__inner {
|
||||||
color: #303133;
|
color: var(--el-text-color-secondary);
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
font-size: var(--el-font-size-small);
|
||||||
}
|
}
|
||||||
|
|
||||||
&:last-child .el-breadcrumb__inner {
|
&:last-child .el-breadcrumb__inner {
|
||||||
color: #303133;
|
color: var(--el-text-color-primary);
|
||||||
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.el-breadcrumb__separator) {
|
:deep(.el-breadcrumb__separator) {
|
||||||
color: #606266;
|
color: var(--el-text-color-placeholder);
|
||||||
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<header class="header">
|
<header class="header">
|
||||||
<div class="navbar">
|
<div class="navbar">
|
||||||
<div class="flex-1 flex">
|
<div class="flex-1 flex items-center gap-1 min-w-0">
|
||||||
<div class="navbar-item">
|
<div class="navbar-item">
|
||||||
<el-tooltip
|
<el-tooltip
|
||||||
class="box-item"
|
class="box-item"
|
||||||
@@ -17,11 +17,14 @@
|
|||||||
<refresh />
|
<refresh />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center px-2" v-if="!isMobile && settingStore.showCrumb">
|
<div
|
||||||
|
class="hidden md:flex items-center min-w-0 px-2"
|
||||||
|
v-if="settingStore.showCrumb && breadcrumbs.length"
|
||||||
|
>
|
||||||
<breadcrumb />
|
<breadcrumb />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex">
|
<div class="flex items-center gap-1">
|
||||||
<div class="navbar-item" v-if="!isMobile">
|
<div class="navbar-item" v-if="!isMobile">
|
||||||
<el-tooltip
|
<el-tooltip
|
||||||
class="box-item"
|
class="box-item"
|
||||||
@@ -36,12 +39,7 @@
|
|||||||
<user-drop-down />
|
<user-drop-down />
|
||||||
</div>
|
</div>
|
||||||
<div class="navbar-item">
|
<div class="navbar-item">
|
||||||
<el-tooltip
|
<el-tooltip class="box-item" effect="dark" content="主题设置" placement="bottom">
|
||||||
class="box-item"
|
|
||||||
effect="dark"
|
|
||||||
content="主题设置"
|
|
||||||
placement="bottom"
|
|
||||||
>
|
|
||||||
<setting />
|
<setting />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
@@ -52,8 +50,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import type { RouteLocationMatched } from 'vue-router'
|
||||||
import { useFullscreen } from '@vueuse/core'
|
import { useFullscreen } from '@vueuse/core'
|
||||||
|
|
||||||
|
import { useWatchRoute } from '@/hooks/useWatchRoute'
|
||||||
import useAppStore from '@/stores/modules/app'
|
import useAppStore from '@/stores/modules/app'
|
||||||
import useSettingStore from '@/stores/modules/setting'
|
import useSettingStore from '@/stores/modules/setting'
|
||||||
|
|
||||||
@@ -70,14 +70,20 @@ const isMobile = computed(() => appStore.isMobile)
|
|||||||
const isCollapsed = computed(() => appStore.isCollapsed)
|
const isCollapsed = computed(() => appStore.isCollapsed)
|
||||||
const settingStore = useSettingStore()
|
const settingStore = useSettingStore()
|
||||||
const { isFullscreen } = useFullscreen()
|
const { isFullscreen } = useFullscreen()
|
||||||
|
|
||||||
|
const breadcrumbs = ref<RouteLocationMatched[]>([])
|
||||||
|
useWatchRoute((route) => {
|
||||||
|
breadcrumbs.value = route.matched.filter((item) => item.meta && item.meta.title)
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.navbar {
|
.navbar {
|
||||||
height: var(--navbar-height);
|
height: var(--navbar-height);
|
||||||
@apply flex px-2 bg-body;
|
@apply flex px-3 bg-body;
|
||||||
|
|
||||||
.navbar-item {
|
.navbar-item {
|
||||||
@apply h-full flex justify-center items-center hover:bg-page;
|
@apply h-full flex justify-center items-center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-tabs pl-4 flex bg-body">
|
<div class="app-tabs flex bg-body">
|
||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0 pl-3">
|
||||||
<el-tabs
|
<el-tabs
|
||||||
:model-value="currentTab"
|
:model-value="currentTab"
|
||||||
:closable="tabsLists.length > 1"
|
:closable="tabsLists.length > 1"
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
</el-tabs>
|
</el-tabs>
|
||||||
</div>
|
</div>
|
||||||
<el-dropdown @command="handleCommand">
|
<el-dropdown @command="handleCommand">
|
||||||
<span class="flex items-center px-3">
|
<span class="tabs-more-btn flex items-center px-3">
|
||||||
<icon :size="16" name="el-icon-arrow-down" />
|
<icon :size="16" name="el-icon-arrow-down" />
|
||||||
</span>
|
</span>
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
@@ -60,61 +60,84 @@ const handleCommand = (command: any) => {
|
|||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.app-tabs {
|
.app-tabs {
|
||||||
@apply border-t border-br;
|
height: var(--tabs-height);
|
||||||
|
border-top: 1px solid var(--admin-header-border);
|
||||||
|
background: var(--admin-surface-glass);
|
||||||
|
backdrop-filter: blur(12px);
|
||||||
|
|
||||||
|
.tabs-more-btn {
|
||||||
|
height: var(--tabs-height);
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.2s ease, background-color 0.2s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: var(--admin-brand-primary-dark);
|
||||||
|
background: var(--admin-brand-gradient-soft);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
:deep(.el-tabs) {
|
:deep(.el-tabs) {
|
||||||
height: 40px;
|
height: var(--tabs-height);
|
||||||
|
|
||||||
.el-tabs {
|
.el-tabs {
|
||||||
&__header {
|
&__header {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__content {
|
&__content {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__nav-next,
|
&__nav-next,
|
||||||
&__nav-prev {
|
&__nav-prev {
|
||||||
@apply text-xl;
|
@apply text-lg;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__nav-wrap::after {
|
&__nav-wrap::after {
|
||||||
height: 0;
|
height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__item {
|
&__item {
|
||||||
font-weight: normal;
|
font-weight: 600;
|
||||||
padding: 0 15px !important;
|
font-size: var(--el-font-size-small);
|
||||||
|
padding: 0 16px !important;
|
||||||
|
height: calc(var(--tabs-height) - 8px);
|
||||||
|
margin-top: 4px;
|
||||||
|
border-radius: var(--admin-radius-md) var(--admin-radius-md) 0 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
transition: color 0.2s ease, background-color 0.2s ease, box-shadow 0.2s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: var(--admin-brand-primary-dark);
|
||||||
|
}
|
||||||
|
|
||||||
&.is-active {
|
&.is-active {
|
||||||
color: var(--el-text-color-primary);
|
color: var(--admin-brand-primary-dark);
|
||||||
background-color: var(--el-color-primary-light-9);
|
background: var(--el-bg-color);
|
||||||
&::before {
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
content: '';
|
border-bottom-color: transparent;
|
||||||
display: inline-block;
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
width: 6px;
|
|
||||||
height: 6px;
|
&::before,
|
||||||
background-color: var(--el-color-primary);
|
|
||||||
margin-right: 6px;
|
|
||||||
border-radius: 50%;
|
|
||||||
vertical-align: 2px;
|
|
||||||
}
|
|
||||||
&::after {
|
&::after {
|
||||||
position: absolute;
|
display: none;
|
||||||
content: '';
|
|
||||||
display: block;
|
|
||||||
top: 0;
|
|
||||||
height: 2px;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
background-color: var(--el-color-primary);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.is-icon-close {
|
.is-icon-close {
|
||||||
color: var(--el-text-color-regular);
|
color: var(--el-text-color-placeholder);
|
||||||
vertical-align: -2px;
|
vertical-align: -2px;
|
||||||
|
border-radius: var(--admin-radius-sm);
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: var(--color-white);
|
color: var(--color-white);
|
||||||
background-color: var(--el-color-danger);
|
background-color: var(--el-color-danger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__active-bar {
|
&__active-bar {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dropdown class="px-2" @command="handleCommand">
|
<el-dropdown class="user-dropdown px-1" @command="handleCommand">
|
||||||
<div class="flex items-center">
|
<div class="user-trigger flex items-center gap-2.5 px-2 py-1 rounded-md cursor-pointer">
|
||||||
<el-avatar :size="34" :src="userInfo.avatar" />
|
<el-avatar :size="32" :src="userInfo.avatar" />
|
||||||
<div class="ml-3 mr-1">{{ userInfo.name }}</div>
|
<span class="user-name max-w-[120px] truncate text-sm font-medium text-tx-primary">{{
|
||||||
<icon name="el-icon-ArrowDown" />
|
userInfo.name
|
||||||
|
}}</span>
|
||||||
|
<icon name="el-icon-ArrowDown" :size="14" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
@@ -41,3 +43,13 @@ const handleCommand = async (command: string) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.user-trigger {
|
||||||
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: var(--el-fill-color-light);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -1,27 +1,56 @@
|
|||||||
<template>
|
<template>
|
||||||
<main class="main-wrap h-full bg-page">
|
|
||||||
|
<main class="main-wrap h-full">
|
||||||
|
|
||||||
<el-scrollbar>
|
<el-scrollbar>
|
||||||
<div class="px-2 py-4">
|
|
||||||
<router-view v-if="isRouteShow" v-slot="{ Component, route }">
|
<div class="main-stage">
|
||||||
<keep-alive :include="includeList" :max="20">
|
|
||||||
<component :is="Component" :key="route.fullPath" />
|
<page-shell v-if="isRouteShow">
|
||||||
</keep-alive>
|
|
||||||
</router-view>
|
<router-view v-slot="{ Component, route }">
|
||||||
|
|
||||||
|
<keep-alive :include="includeList" :max="20">
|
||||||
|
|
||||||
|
<component :is="Component" :key="route.fullPath" />
|
||||||
|
|
||||||
|
</keep-alive>
|
||||||
|
|
||||||
|
</router-view>
|
||||||
|
|
||||||
|
</page-shell>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
|
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import PageShell from '@/components/page-shell/index.vue'
|
||||||
|
|
||||||
import useAppStore from '@/stores/modules/app'
|
import useAppStore from '@/stores/modules/app'
|
||||||
|
|
||||||
import useTabsStore from '@/stores/modules/multipleTabs'
|
import useTabsStore from '@/stores/modules/multipleTabs'
|
||||||
|
|
||||||
import useSettingStore from '@/stores/modules/setting'
|
import useSettingStore from '@/stores/modules/setting'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const appStore = useAppStore()
|
const appStore = useAppStore()
|
||||||
|
|
||||||
const tabsStore = useTabsStore()
|
const tabsStore = useTabsStore()
|
||||||
|
|
||||||
const settingStore = useSettingStore()
|
const settingStore = useSettingStore()
|
||||||
|
|
||||||
const isRouteShow = computed(() => appStore.isRouteShow)
|
const isRouteShow = computed(() => appStore.isRouteShow)
|
||||||
|
|
||||||
const includeList = computed(() => (settingStore.openMultipleTabs ? tabsStore.getCacheTabList : []))
|
const includeList = computed(() => (settingStore.openMultipleTabs ? tabsStore.getCacheTabList : []))
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style></style>
|
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ import theme_light from '@/assets/images/theme_white.png'
|
|||||||
import useSettingStore from '@/stores/modules/setting'
|
import useSettingStore from '@/stores/modules/setting'
|
||||||
|
|
||||||
const settingStore = useSettingStore()
|
const settingStore = useSettingStore()
|
||||||
const predefineColors = ref(['#409EFF', '#28C76F', '#EA5455', '#FF9F43', '#01CFE8', '#4A5DFF'])
|
const predefineColors = ref(['#06b6d4', '#10b981', '#0891b2', '#6366f1', '#f59e0b', '#ef4444', '#64748b'])
|
||||||
const sideThemeList = [
|
const sideThemeList = [
|
||||||
{
|
{
|
||||||
type: 'dark',
|
type: 'dark',
|
||||||
|
|||||||
@@ -68,32 +68,42 @@ const themeClass = computed(() => `theme-${props.theme}`)
|
|||||||
.el-menu {
|
.el-menu {
|
||||||
:deep(.el-menu-item) {
|
:deep(.el-menu-item) {
|
||||||
&.is-active {
|
&.is-active {
|
||||||
@apply bg-primary border-primary;
|
@apply bg-primary;
|
||||||
|
box-shadow: inset 3px 0 0 var(--el-color-primary-light-3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.el-menu--collapse) {
|
:deep(.el-menu--collapse) {
|
||||||
.el-sub-menu.is-active .el-sub-menu__title {
|
.el-sub-menu.is-active .el-sub-menu__title {
|
||||||
@apply bg-primary #{!important};
|
@apply bg-primary #{!important};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.theme-light {
|
&.theme-light {
|
||||||
:deep(.el-menu) {
|
:deep(.el-menu) {
|
||||||
.el-menu-item {
|
.el-menu-item {
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
|
|
||||||
&.is-active {
|
&.is-active {
|
||||||
@apply bg-primary-light-9 border-r-2 border-primary;
|
@apply bg-primary-light-9;
|
||||||
|
color: var(--el-color-primary);
|
||||||
|
font-weight: 600;
|
||||||
|
box-shadow: inset 3px 0 0 var(--el-color-primary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-menu-item:hover,
|
.el-menu-item:hover,
|
||||||
.el-sub-menu__title:hover {
|
.el-sub-menu__title:hover {
|
||||||
color: var(--el-color-primary);
|
color: var(--el-color-primary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-menu {
|
.el-menu {
|
||||||
border-right: none;
|
border-right: none;
|
||||||
|
|
||||||
&:not(.el-menu--collapse) {
|
&:not(.el-menu--collapse) {
|
||||||
width: var(--aside-width);
|
width: var(--aside-width);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="side" :style="sideStyle">
|
<div class="side" :style="sideStyle">
|
||||||
|
<div v-if="showBrandStrip" class="sidebar-brand">
|
||||||
|
<div class="sidebar-brand__mark">ZY</div>
|
||||||
|
<overflow-tooltip
|
||||||
|
class="sidebar-brand__name"
|
||||||
|
:content="config.web_name"
|
||||||
|
:teleported="true"
|
||||||
|
placement="bottom"
|
||||||
|
overflo-type="unset"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<side-logo v-if="settingStore.showLogo" :show-title="!isCollapsed" :theme="sideTheme" />
|
<side-logo v-if="settingStore.showLogo" :show-title="!isCollapsed" :theme="sideTheme" />
|
||||||
<side-menu
|
<side-menu
|
||||||
:routes="routes"
|
:routes="routes"
|
||||||
@@ -25,17 +35,19 @@ const appStore = useAppStore()
|
|||||||
const isCollapsed = computed(() => {
|
const isCollapsed = computed(() => {
|
||||||
if (appStore.isMobile) {
|
if (appStore.isMobile) {
|
||||||
return false
|
return false
|
||||||
} else {
|
|
||||||
return appStore.isCollapsed
|
|
||||||
}
|
}
|
||||||
|
return appStore.isCollapsed
|
||||||
})
|
})
|
||||||
|
|
||||||
const settingStore = useSettingStore()
|
const settingStore = useSettingStore()
|
||||||
const sideTheme = computed(() => settingStore.sideTheme)
|
const sideTheme = computed(() => settingStore.sideTheme)
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
|
const config = computed(() => appStore.config)
|
||||||
|
|
||||||
const routes = computed(() => userStore.routes)
|
const routes = computed(() => userStore.routes)
|
||||||
|
|
||||||
|
const showBrandStrip = computed(() => !settingStore.showLogo && !isCollapsed.value)
|
||||||
|
|
||||||
const sideStyle = computed(() => {
|
const sideStyle = computed(() => {
|
||||||
return sideTheme.value == 'dark'
|
return sideTheme.value == 'dark'
|
||||||
? {
|
? {
|
||||||
@@ -43,6 +55,7 @@ const sideStyle = computed(() => {
|
|||||||
}
|
}
|
||||||
: ''
|
: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
const menuProp = computed(() => {
|
const menuProp = computed(() => {
|
||||||
return {
|
return {
|
||||||
backgroundColor: sideTheme.value == 'dark' ? settingStore.sideDarkColor : '',
|
backgroundColor: sideTheme.value == 'dark' ? settingStore.sideDarkColor : '',
|
||||||
@@ -50,6 +63,7 @@ const menuProp = computed(() => {
|
|||||||
activeTextColor: sideTheme.value == 'dark' ? 'var(--el-color-white)' : ''
|
activeTextColor: sideTheme.value == 'dark' ? 'var(--el-color-white)' : ''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const handleSelect = () => {
|
const handleSelect = () => {
|
||||||
if (appStore.isMobile) {
|
if (appStore.isMobile) {
|
||||||
appStore.toggleCollapsed(true)
|
appStore.toggleCollapsed(true)
|
||||||
@@ -61,7 +75,8 @@ const handleSelect = () => {
|
|||||||
.side {
|
.side {
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 999;
|
z-index: 999;
|
||||||
@apply border-r border-br-light h-full flex flex-col;
|
@apply h-full flex flex-col;
|
||||||
background-color: var(--side-dark-color, var(--el-bg-color));
|
border-right: 1px solid var(--admin-sidebar-border);
|
||||||
|
background-color: var(--side-dark-color, var(--sidebar-dark-bg));
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,298 @@
|
|||||||
|
/**
|
||||||
|
* Admin 页面架构 v2 - 大改版面板系统
|
||||||
|
*/
|
||||||
|
|
||||||
|
.admin-page .page-stage__body {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- FilterPanel ---------- */
|
||||||
|
.admin-filter-panel {
|
||||||
|
position: relative;
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
background: var(--admin-surface-glass);
|
||||||
|
backdrop-filter: blur(12px);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0 0 auto;
|
||||||
|
height: 3px;
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-filter-panel__head {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 14px 22px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-filter-panel__label {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-filter-panel__toggle {
|
||||||
|
padding: 0;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-filter-panel__body {
|
||||||
|
padding: 14px 22px 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-filter-panel.is-collapsed .admin-filter-panel__body {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-filter-panel .el-form--inline {
|
||||||
|
margin-bottom: 0;
|
||||||
|
|
||||||
|
.el-form-item {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
margin-right: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-form-item__label {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--el-text-color-regular);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- DataPanel ---------- */
|
||||||
|
.admin-data-panel {
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
background: var(--admin-surface-elevated);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-data-panel__toolbar {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 16px 22px;
|
||||||
|
border-bottom: 1px solid var(--el-border-color-extra-light);
|
||||||
|
background: var(--admin-brand-gradient-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-data-panel__body {
|
||||||
|
padding: 0 22px 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-data-panel__toolbar + .admin-data-panel__body {
|
||||||
|
padding-top: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-data-panel__footer {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding: 0 22px 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- FormPanel ---------- */
|
||||||
|
.admin-form-panel {
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
background: var(--admin-surface-elevated);
|
||||||
|
box-shadow: var(--el-box-shadow-light);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-form-panel__header {
|
||||||
|
padding: 16px 22px;
|
||||||
|
border-bottom: 1px solid var(--el-border-color-extra-light);
|
||||||
|
background: var(--admin-brand-gradient-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-form-panel__title {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 17px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-form-panel__body {
|
||||||
|
padding: 22px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-form-panel__footer {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 16px 22px 22px;
|
||||||
|
border-top: 1px solid var(--el-border-color-extra-light);
|
||||||
|
background: var(--el-fill-color-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- StatGrid ---------- */
|
||||||
|
.admin-stat-grid {
|
||||||
|
display: grid;
|
||||||
|
gap: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-grid--cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); }
|
||||||
|
.admin-stat-grid--cols-3 { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
||||||
|
.admin-stat-grid--cols-4 { grid-template-columns: repeat(4, minmax(0, 1fr)); }
|
||||||
|
.admin-stat-grid--cols-5 { grid-template-columns: repeat(5, minmax(0, 1fr)); }
|
||||||
|
|
||||||
|
.admin-stat-item {
|
||||||
|
position: relative;
|
||||||
|
padding: 18px 20px;
|
||||||
|
border-radius: var(--admin-radius-lg);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
background: var(--admin-surface-elevated);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
overflow: hidden;
|
||||||
|
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0 auto 0 0;
|
||||||
|
width: 4px;
|
||||||
|
background: var(--el-border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: var(--el-box-shadow-light);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item--primary {
|
||||||
|
&::before { background: var(--admin-brand-gradient); }
|
||||||
|
border-color: rgba(6, 182, 212, 0.2);
|
||||||
|
background: linear-gradient(145deg, rgba(6, 182, 212, 0.08), rgba(16, 185, 129, 0.05));
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item--success {
|
||||||
|
&::before { background: #10b981; }
|
||||||
|
border-color: rgba(16, 185, 129, 0.22);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item--warning {
|
||||||
|
&::before { background: #f59e0b; }
|
||||||
|
border-color: rgba(245, 158, 11, 0.22);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item__label {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item__value {
|
||||||
|
margin-top: 10px;
|
||||||
|
font-size: 30px;
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1.05;
|
||||||
|
letter-spacing: -0.03em;
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item__value.is-money {
|
||||||
|
font-size: 26px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item__hint {
|
||||||
|
margin: 8px 0 0;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--el-text-color-placeholder);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- Tables ---------- */
|
||||||
|
.admin-data-panel .el-table,
|
||||||
|
.admin-page .el-card .el-table {
|
||||||
|
--el-table-border-color: transparent;
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
|
||||||
|
thead th.el-table__cell {
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
z-index: 2;
|
||||||
|
background: var(--table-header-bg-color) !important;
|
||||||
|
border-bottom: 1px solid var(--el-border-color-lighter);
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: var(--el-font-size-small);
|
||||||
|
}
|
||||||
|
|
||||||
|
td.el-table__cell {
|
||||||
|
border-bottom: 1px solid var(--el-border-color-extra-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-table__row:hover > td.el-table__cell {
|
||||||
|
background-color: rgba(6, 182, 212, 0.04) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-table__row.current-row > td.el-table__cell {
|
||||||
|
background-color: rgba(6, 182, 212, 0.08) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- Legacy cards ---------- */
|
||||||
|
.admin-page .page-stage__body {
|
||||||
|
> div > .el-card:first-child:has(.el-form),
|
||||||
|
> .el-card:first-child:has(.el-form) {
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
> div > .el-card + .el-card,
|
||||||
|
> .el-card + .el-card {
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.workbench-page {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1200px) {
|
||||||
|
.admin-stat-grid--cols-4,
|
||||||
|
.admin-stat-grid--cols-5 {
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.admin-filter-panel__body,
|
||||||
|
.admin-data-panel__body,
|
||||||
|
.admin-data-panel__toolbar,
|
||||||
|
.admin-data-panel__footer {
|
||||||
|
padding-left: 16px;
|
||||||
|
padding-right: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-grid--cols-2,
|
||||||
|
.admin-stat-grid--cols-3,
|
||||||
|
.admin-stat-grid--cols-4,
|
||||||
|
.admin-stat-grid--cols-5 {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-item:hover {
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.admin-stat-item {
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,190 @@
|
|||||||
|
/* Admin Shell v2 - 互联网医院工作台大改版 */
|
||||||
|
|
||||||
|
.layout-default {
|
||||||
|
background: var(--sidebar-dark-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- Sidebar ---------- */
|
||||||
|
.app-aside .side {
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0 auto 0 0;
|
||||||
|
width: var(--sidebar-rail-width);
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
z-index: 2;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background:
|
||||||
|
radial-gradient(circle at 0% 0%, var(--admin-brand-mesh-a), transparent 45%),
|
||||||
|
radial-gradient(circle at 100% 100%, var(--admin-brand-mesh-b), transparent 40%);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-brand {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
min-height: calc(var(--navbar-height) + 4px);
|
||||||
|
padding: 0 18px 0 20px;
|
||||||
|
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-brand__mark {
|
||||||
|
width: 38px;
|
||||||
|
height: 38px;
|
||||||
|
border-radius: 12px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 800;
|
||||||
|
letter-spacing: 0.1em;
|
||||||
|
color: #ffffff;
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
box-shadow: var(--admin-brand-glow);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-brand__name {
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: rgba(255, 255, 255, 0.95);
|
||||||
|
line-height: 1.25;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.theme-dark .el-menu {
|
||||||
|
--el-menu-bg-color: transparent;
|
||||||
|
--el-menu-hover-bg-color: var(--sidebar-dark-hover);
|
||||||
|
--el-menu-active-color: #ffffff;
|
||||||
|
--el-menu-text-color: rgba(255, 255, 255, 0.62);
|
||||||
|
padding: 12px 10px 16px;
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.theme-dark .el-menu .el-menu-item,
|
||||||
|
.menu.theme-dark .el-menu .el-sub-menu__title {
|
||||||
|
margin: 3px 8px;
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
transition: background-color 0.2s ease, color 0.2s ease, box-shadow 0.2s ease, transform 0.12s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.theme-dark .el-menu .el-menu-item.is-active {
|
||||||
|
background: var(--sidebar-dark-active) !important;
|
||||||
|
color: #ffffff;
|
||||||
|
font-weight: 600;
|
||||||
|
box-shadow:
|
||||||
|
inset 0 0 0 1px rgba(6, 182, 212, 0.28),
|
||||||
|
0 8px 24px rgba(6, 182, 212, 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.theme-dark .el-menu .el-menu-item:hover,
|
||||||
|
.menu.theme-dark .el-menu .el-sub-menu__title:hover {
|
||||||
|
background: var(--sidebar-dark-hover);
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.theme-light .el-menu .el-menu-item.is-active {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--admin-brand-primary-dark);
|
||||||
|
background: var(--admin-brand-gradient-soft);
|
||||||
|
box-shadow: inset 3px 0 0 var(--admin-brand-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- Header ---------- */
|
||||||
|
.app-header {
|
||||||
|
position: relative;
|
||||||
|
z-index: 20;
|
||||||
|
background: var(--admin-surface-glass);
|
||||||
|
backdrop-filter: blur(20px) saturate(160%);
|
||||||
|
border-bottom: 1px solid var(--admin-header-border);
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: auto 0 0;
|
||||||
|
height: 2px;
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
opacity: 0.75;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:root.dark .app-header {
|
||||||
|
background: rgba(15, 23, 42, 0.88);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-tool {
|
||||||
|
width: 38px;
|
||||||
|
height: 38px;
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
color: var(--el-text-color-regular);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.2s ease, color 0.2s ease, transform 0.12s ease, box-shadow 0.2s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: var(--admin-brand-gradient-soft);
|
||||||
|
color: var(--admin-brand-primary-dark);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
transform: scale(0.96);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- Main stage (去掉双层白盒) ---------- */
|
||||||
|
.main-wrap {
|
||||||
|
position: relative;
|
||||||
|
background:
|
||||||
|
radial-gradient(circle at 0% 0%, var(--admin-brand-mesh-a), transparent 34%),
|
||||||
|
radial-gradient(circle at 100% 0%, var(--admin-brand-mesh-c), transparent 30%),
|
||||||
|
radial-gradient(circle at 50% 100%, var(--admin-brand-mesh-b), transparent 38%),
|
||||||
|
var(--el-bg-color-page);
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-stage {
|
||||||
|
max-width: var(--content-max-width);
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: var(--stage-padding-y) var(--stage-padding-x);
|
||||||
|
min-height: calc(100vh - var(--navbar-height) - var(--tabs-height, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
:root {
|
||||||
|
--stage-padding-x: 14px;
|
||||||
|
--stage-padding-y: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.navbar-tool,
|
||||||
|
.menu.theme-dark .el-menu .el-menu-item,
|
||||||
|
.menu.theme-dark .el-menu .el-sub-menu__title {
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-transparency: reduce) {
|
||||||
|
.app-header {
|
||||||
|
backdrop-filter: none;
|
||||||
|
background: var(--el-bg-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
+46
-31
@@ -1,43 +1,58 @@
|
|||||||
:root.dark {
|
:root.dark {
|
||||||
color-scheme: dark;
|
color-scheme: dark;
|
||||||
--table-header-bg-color: var(--el-bg-color);
|
|
||||||
--el-bg-color-page: #0a0a0a;
|
--table-header-bg-color: rgba(6, 182, 212, 0.12);
|
||||||
--el-bg-color: #1d2124;
|
--sidebar-dark-bg: #030712;
|
||||||
--el-bg-color-overlay: #1d1e1f;
|
--sidebar-dark-hover: rgba(255, 255, 255, 0.05);
|
||||||
--el-text-color-primary: #e5eaf3;
|
--sidebar-dark-active: rgba(6, 182, 212, 0.2);
|
||||||
--el-text-color-regular: #cfd3dc;
|
|
||||||
--el-text-color-secondary: #a3a6ad;
|
--admin-surface-elevated: #111827;
|
||||||
--el-text-color-placeholder: #8d9095;
|
--admin-surface-muted: rgba(17, 24, 39, 0.88);
|
||||||
--el-text-color-disabled: #6c6e72;
|
--admin-surface-glass: rgba(17, 24, 39, 0.86);
|
||||||
--el-border-color-darker: #636466;
|
|
||||||
--el-border-color-dark: #58585b;
|
--el-bg-color-page: #030712;
|
||||||
--el-border-color: #4c4d4f;
|
--el-bg-color: #0f172a;
|
||||||
--el-border-color-light: #414243;
|
--el-bg-color-overlay: #1e293b;
|
||||||
--el-border-color-lighter: #363637;
|
--el-text-color-primary: #f1f5f9;
|
||||||
--el-border-color-extra-light: #2b2b2c;
|
--el-text-color-regular: #cbd5e1;
|
||||||
--el-fill-color-darker: #424243;
|
--el-text-color-secondary: #94a3b8;
|
||||||
--el-fill-color-dark: #39393a;
|
--el-text-color-placeholder: #64748b;
|
||||||
--el-fill-color: #303030;
|
--el-text-color-disabled: #475569;
|
||||||
--el-fill-color-light: #262727;
|
--el-border-color-darker: #64748b;
|
||||||
--el-fill-color-lighter: #1d1d1d;
|
--el-border-color-dark: #475569;
|
||||||
--el-fill-color-extra-light: #191919;
|
--el-border-color: rgba(6, 182, 212, 0.18);
|
||||||
|
--el-border-color-light: rgba(6, 182, 212, 0.12);
|
||||||
|
--el-border-color-lighter: rgba(255, 255, 255, 0.06);
|
||||||
|
--el-border-color-extra-light: rgba(255, 255, 255, 0.04);
|
||||||
|
--el-fill-color-darker: #334155;
|
||||||
|
--el-fill-color-dark: #1e293b;
|
||||||
|
--el-fill-color: #1e293b;
|
||||||
|
--el-fill-color-light: #172033;
|
||||||
|
--el-fill-color-lighter: #131c2e;
|
||||||
|
--el-fill-color-extra-light: #0f172a;
|
||||||
--el-fill-color-blank: var(--el-bg-color);
|
--el-fill-color-blank: var(--el-bg-color);
|
||||||
--el-mask-color: rgba(0, 0, 0, 0.8);
|
|
||||||
--el-mask-color-extra-light: rgba(0, 0, 0, 0.3);
|
--el-mask-color: rgba(2, 6, 23, 0.78);
|
||||||
--el-box-shadow: 0px 12px 32px 4px rgba(0, 0, 0, 0.36), 0px 8px 20px rgba(0, 0, 0, 0.72);
|
--el-mask-color-extra-light: rgba(2, 6, 23, 0.42);
|
||||||
--el-box-shadow-light: 0px 0px 12px rgba(0, 0, 0, 0.72);
|
|
||||||
--el-box-shadow-lighter: 0px 0px 6px rgba(0, 0, 0, 0.72);
|
--el-box-shadow: 0 4px 24px rgba(0, 0, 0, 0.28);
|
||||||
--el-box-shadow-dark: 0px 16px 48px 16px rgba(0, 0, 0, 0.72), 0px 12px 32px #000000,
|
--el-box-shadow-light: 0 2px 16px rgba(0, 0, 0, 0.22);
|
||||||
0px 8px 16px -8px #000000 !important;
|
--el-box-shadow-lighter: 0 1px 4px rgba(0, 0, 0, 0.16);
|
||||||
/* wangeditor主题 */
|
--el-box-shadow-dark: 0 16px 48px rgba(0, 0, 0, 0.36);
|
||||||
|
|
||||||
|
--admin-header-border: rgba(6, 182, 212, 0.14);
|
||||||
|
--admin-sidebar-border: rgba(255, 255, 255, 0.04);
|
||||||
|
|
||||||
|
--admin-brand-mesh-a: rgba(6, 182, 212, 0.12);
|
||||||
|
--admin-brand-mesh-b: rgba(16, 185, 129, 0.08);
|
||||||
|
--admin-brand-mesh-c: rgba(99, 102, 241, 0.06);
|
||||||
|
|
||||||
--w-e-textarea-bg-color: var(--el-bg-color);
|
--w-e-textarea-bg-color: var(--el-bg-color);
|
||||||
--w-e-textarea-color: var(--el-text-color-primary);
|
--w-e-textarea-color: var(--el-text-color-primary);
|
||||||
--w-e-textarea-border-color: var(--el-border-color);
|
--w-e-textarea-border-color: var(--el-border-color);
|
||||||
--w-e-textarea-slight-border-color: var(--el-border-color-light);
|
--w-e-textarea-slight-border-color: var(--el-border-color-light);
|
||||||
--w-e-textarea-slight-color: var(--el-border-color);
|
--w-e-textarea-slight-color: var(--el-border-color);
|
||||||
--w-e-textarea-slight-bg-color: var(--el-bg-color-page);
|
--w-e-textarea-slight-bg-color: var(--el-bg-color-page);
|
||||||
/* --w-e-textarea-selected-border-color: #b4d5ff;
|
|
||||||
--w-e-textarea-handler-bg-color: #4290f7; */
|
|
||||||
--w-e-toolbar-color: var(--el-text-color-primary);
|
--w-e-toolbar-color: var(--el-text-color-primary);
|
||||||
--w-e-toolbar-bg-color: var(--el-bg-color);
|
--w-e-toolbar-bg-color: var(--el-bg-color);
|
||||||
--w-e-toolbar-active-color: var(--el-text-color-primary);
|
--w-e-toolbar-active-color: var(--el-text-color-primary);
|
||||||
|
|||||||
+244
-24
@@ -1,14 +1,20 @@
|
|||||||
:root {
|
:root {
|
||||||
// 确保消息提示在最上层
|
/* Messages & notifications */
|
||||||
.el-message {
|
.el-message {
|
||||||
z-index: 9999 !important;
|
z-index: 9999 !important;
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-notification {
|
.el-notification {
|
||||||
z-index: 9999 !important;
|
z-index: 9999 !important;
|
||||||
|
border-radius: var(--admin-radius-lg);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 弹窗居中
|
/* Dialog */
|
||||||
.el-overlay-dialog {
|
.el-overlay-dialog {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@@ -19,11 +25,14 @@
|
|||||||
.el-dialog {
|
.el-dialog {
|
||||||
--el-dialog-content-font-size: var(--el-font-size-base);
|
--el-dialog-content-font-size: var(--el-font-size-base);
|
||||||
--el-dialog-margin-top: 50px;
|
--el-dialog-margin-top: 50px;
|
||||||
max-width: calc(100vw - 30px);
|
--el-dialog-border-radius: var(--admin-radius-lg);
|
||||||
|
max-width: calc(100vw - 32px);
|
||||||
flex: none;
|
flex: none;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
border-radius: 5px;
|
border-radius: var(--admin-radius-lg);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow-dark);
|
||||||
|
|
||||||
&.body-padding .el-dialog__body {
|
&.body-padding .el-dialog__body {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
@@ -31,50 +40,158 @@
|
|||||||
|
|
||||||
.el-dialog__body {
|
.el-dialog__body {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
padding: 15px 20px;
|
padding: 16px 20px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-dialog__header {
|
.el-dialog__header {
|
||||||
font-size: var(--el-font-size-large);
|
font-size: var(--el-font-size-large);
|
||||||
|
font-weight: 600;
|
||||||
|
padding: 16px 20px 12px;
|
||||||
|
margin-right: 0;
|
||||||
|
border-bottom: 1px solid var(--el-border-color-extra-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-dialog__footer {
|
||||||
|
padding: 12px 20px 16px;
|
||||||
|
border-top: 1px solid var(--el-border-color-extra-light);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Cards - applies to all list pages */
|
||||||
|
.el-card {
|
||||||
|
--el-card-border-radius: var(--admin-radius-lg);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: none;
|
||||||
|
background: var(--admin-surface-elevated);
|
||||||
|
transition: border-color 0.2s ease, box-shadow 0.2s ease;
|
||||||
|
|
||||||
|
&.is-always-shadow,
|
||||||
|
&.is-hover-shadow:hover {
|
||||||
|
box-shadow: var(--el-box-shadow-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-card__header {
|
||||||
|
padding: 14px 18px;
|
||||||
|
border-bottom: 1px solid var(--el-border-color-extra-light);
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-card__body {
|
||||||
|
padding: 18px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Menu */
|
||||||
.el-menu {
|
.el-menu {
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Drawer */
|
||||||
.el-drawer {
|
.el-drawer {
|
||||||
--el-drawer-padding-primary: 16px;
|
--el-drawer-padding-primary: 16px;
|
||||||
|
|
||||||
&__header {
|
&__header {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
padding: 13px 16px;
|
padding: 14px 18px;
|
||||||
border-bottom: 1px solid var(--el-border-color-lighter);
|
border-bottom: 1px solid var(--el-border-color-lighter);
|
||||||
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__title {
|
&__title {
|
||||||
@apply text-tx-primary;
|
@apply text-tx-primary;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.el-table {
|
&__body {
|
||||||
--el-table-header-text-color: var(--el-text-color-primary);
|
padding: 16px 18px;
|
||||||
--el-table-header-bg-color: var(--table-header-bg-color);
|
|
||||||
font-size: var(--el-font-size-base);
|
|
||||||
|
|
||||||
thead {
|
|
||||||
th {
|
|
||||||
font-weight: 400;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Table */
|
||||||
|
.el-table {
|
||||||
|
--el-table-header-text-color: var(--el-text-color-primary);
|
||||||
|
--el-table-header-bg-color: var(--table-header-bg-color);
|
||||||
|
--el-table-border-color: var(--el-border-color-extra-light);
|
||||||
|
--el-table-row-hover-bg-color: var(--el-fill-color-lighter);
|
||||||
|
font-size: var(--el-font-size-base);
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
thead {
|
||||||
|
th {
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: var(--el-font-size-small);
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
}
|
||||||
|
|
||||||
|
th.el-table__cell {
|
||||||
|
background-color: var(--table-header-bg-color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-table__cell {
|
||||||
|
padding: 12px 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Form controls */
|
||||||
.el-input-group__prepend {
|
.el-input-group__prepend {
|
||||||
background-color: var(--el-fill-color-blank);
|
background-color: var(--el-fill-color-light);
|
||||||
|
border-color: var(--el-border-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-checkbox {
|
.el-checkbox {
|
||||||
--el-checkbox-font-size: var(--el-font-size-base);
|
--el-checkbox-font-size: var(--el-font-size-base);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-button {
|
||||||
|
--el-border-radius-base: var(--admin-radius-md);
|
||||||
|
font-weight: 500;
|
||||||
|
transition: transform 0.12s ease, box-shadow 0.2s ease, background-color 0.2s ease;
|
||||||
|
|
||||||
|
&:active:not(.is-disabled) {
|
||||||
|
transform: scale(0.98);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button--primary:not(.is-link):not(.is-text):not(.is-plain) {
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
border: none;
|
||||||
|
box-shadow: var(--admin-brand-glow);
|
||||||
|
--el-button-bg-color: transparent;
|
||||||
|
--el-button-border-color: transparent;
|
||||||
|
--el-button-hover-bg-color: transparent;
|
||||||
|
--el-button-hover-border-color: transparent;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
filter: brightness(1.05);
|
||||||
|
box-shadow: 0 12px 32px rgba(6, 182, 212, 0.32);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button--primary.is-link,
|
||||||
|
.el-button--primary.is-text {
|
||||||
|
--el-button-hover-link-text-color: var(--admin-brand-primary-dark);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button--primary.is-plain {
|
||||||
|
--el-button-bg-color: rgba(6, 182, 212, 0.1);
|
||||||
|
--el-button-border-color: rgba(6, 182, 212, 0.35);
|
||||||
|
--el-button-text-color: var(--admin-brand-primary-dark);
|
||||||
|
--el-button-hover-bg-color: rgba(6, 182, 212, 0.16);
|
||||||
|
--el-button-hover-border-color: var(--admin-brand-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button--large {
|
||||||
|
--el-border-radius-base: var(--admin-radius-md);
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button.is-round {
|
||||||
|
--el-border-radius-base: var(--admin-radius-round);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Popup menus */
|
||||||
.el-menu--popup-container {
|
.el-menu--popup-container {
|
||||||
&.theme-light {
|
&.theme-light {
|
||||||
.el-menu {
|
.el-menu {
|
||||||
@@ -83,12 +200,14 @@
|
|||||||
@apply bg-primary-light-9 border-primary border-r-2;
|
@apply bg-primary-light-9 border-primary border-r-2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-menu-item:hover,
|
.el-menu-item:hover,
|
||||||
.el-sub-menu__title:hover {
|
.el-sub-menu__title:hover {
|
||||||
color: var(--el-color-primary);
|
color: var(--el-color-primary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.theme-dark {
|
&.theme-dark {
|
||||||
.el-menu {
|
.el-menu {
|
||||||
.el-menu-item {
|
.el-menu-item {
|
||||||
@@ -101,52 +220,120 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.el-message-box {
|
.el-message-box {
|
||||||
--el-messagebox-width: 350px;
|
--el-messagebox-width: 380px;
|
||||||
|
--el-messagebox-border-radius: var(--admin-radius-lg);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-date-editor {
|
.el-date-editor {
|
||||||
--el-date-editor-datetimerange-width: 380px;
|
--el-date-editor-datetimerange-width: 380px;
|
||||||
|
|
||||||
.el-range-input {
|
.el-range-input {
|
||||||
font-size: var(--el-font-size-small);
|
font-size: var(--el-font-size-small);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-button--primary {
|
|
||||||
--el-button-hover-link-text-color: var(--el-color-primary-light-3);
|
|
||||||
}
|
|
||||||
.el-button--success {
|
.el-button--success {
|
||||||
--el-button-hover-link-text-color: var(--el-color-success-light-3);
|
--el-button-hover-link-text-color: var(--el-color-success-light-3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-button--info {
|
.el-button--info {
|
||||||
--el-button-hover-link-text-color: var(--el-color-info-light-3);
|
--el-button-hover-link-text-color: var(--el-color-info-light-3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-button--warning {
|
.el-button--warning {
|
||||||
--el-button-hover-link-text-color: var(--el-color-warning-light-3);
|
--el-button-hover-link-text-color: var(--el-color-warning-light-3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-button--danger {
|
.el-button--danger {
|
||||||
--el-button-hover-link-text-color: var(--el-color-danger-light-3);
|
--el-button-hover-link-text-color: var(--el-color-danger-light-3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-image__error {
|
.el-image__error {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-tabs__nav-wrap::after {
|
.el-tabs__nav-wrap::after {
|
||||||
height: 1px;
|
height: 1px;
|
||||||
|
background: var(--el-border-color-extra-light);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-tabs__item {
|
||||||
|
font-weight: 500;
|
||||||
|
transition: color 0.2s ease;
|
||||||
|
|
||||||
|
&.is-active {
|
||||||
|
color: var(--el-color-primary);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: var(--el-color-primary-light-3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-tabs__active-bar {
|
||||||
|
height: 3px;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
}
|
||||||
|
|
||||||
.el-page-header {
|
.el-page-header {
|
||||||
&__breadcrumb {
|
&__breadcrumb {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Tags */
|
||||||
|
.el-tag {
|
||||||
|
--el-tag-border-radius: var(--admin-radius-sm);
|
||||||
|
border: none;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Pagination */
|
||||||
|
.el-pagination {
|
||||||
|
.el-pager li {
|
||||||
|
border-radius: var(--admin-radius-sm);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-prev,
|
||||||
|
.btn-next {
|
||||||
|
border-radius: var(--admin-radius-sm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Alert */
|
||||||
|
.el-alert {
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
border: 1px solid var(--el-border-color-extra-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Empty state */
|
||||||
|
.el-empty {
|
||||||
|
padding: 32px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Descriptions */
|
||||||
|
.el-descriptions {
|
||||||
|
.el-descriptions__label {
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Focus rings */
|
||||||
.el-input,
|
.el-input,
|
||||||
.el-select,
|
.el-select,
|
||||||
.el-textarea {
|
.el-textarea {
|
||||||
@apply shadow-primary-light-8;
|
@apply shadow-primary-light-8;
|
||||||
|
|
||||||
box-shadow: 0 0 0 0 var(--tw-shadow-color);
|
box-shadow: 0 0 0 0 var(--tw-shadow-color);
|
||||||
|
|
||||||
&:focus-within {
|
&:focus-within {
|
||||||
box-shadow: 0 0 0 2px var(--tw-shadow-color);
|
box-shadow: 0 0 0 2px var(--tw-shadow-color);
|
||||||
border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
|
border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
|
||||||
transition: box-shadow ease 0.1s;
|
transition: box-shadow ease 0.15s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,6 +343,7 @@
|
|||||||
border-radius: var(--el-checkbox-border-radius);
|
border-radius: var(--el-checkbox-border-radius);
|
||||||
|
|
||||||
box-shadow: 0 0 0 0 var(--tw-shadow-color);
|
box-shadow: 0 0 0 0 var(--tw-shadow-color);
|
||||||
|
|
||||||
&:active {
|
&:active {
|
||||||
box-shadow: 0 0 0 2px var(--tw-shadow-color);
|
box-shadow: 0 0 0 2px var(--tw-shadow-color);
|
||||||
transition: box-shadow ease 0s;
|
transition: box-shadow ease 0s;
|
||||||
@@ -173,29 +361,61 @@
|
|||||||
.el-form-item.is-error .el-checkbox {
|
.el-form-item.is-error .el-checkbox {
|
||||||
@apply shadow-danger-light-8;
|
@apply shadow-danger-light-8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Dropdown */
|
||||||
|
.el-dropdown-menu {
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-dropdown-menu__item {
|
||||||
|
border-radius: var(--admin-radius-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Popover / tooltip polish */
|
||||||
|
.el-popover.el-popper {
|
||||||
|
border-radius: var(--admin-radius-md);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.el-pagination > .el-pagination__jump {
|
.el-pagination > .el-pagination__jump {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-pagination > .el-pagination__sizes {
|
.el-pagination > .el-pagination__sizes {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-button {
|
.el-button {
|
||||||
// 防止被tailwindcss默认样式覆盖
|
|
||||||
background-color: var(--el-button-bg-color, var(--el-color-white));
|
background-color: var(--el-button-bg-color, var(--el-color-white));
|
||||||
|
|
||||||
//覆盖el-button的点击样式
|
|
||||||
&:focus {
|
&:focus {
|
||||||
color: var(--el-button-text-color);
|
color: var(--el-button-text-color);
|
||||||
border-color: var(--el-button-border-color);
|
border-color: var(--el-button-border-color);
|
||||||
background-color: var(--el-button-bg-color);
|
background-color: var(--el-button-bg-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: var(--el-button-hover-text-color);
|
color: var(--el-button-hover-text-color);
|
||||||
border-color: var(--el-button-hover-border-color);
|
border-color: var(--el-button-hover-border-color);
|
||||||
background-color: var(--el-button-hover-bg-color);
|
background-color: var(--el-button-hover-bg-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Inline form filter blocks on list pages */
|
||||||
|
.el-card .el-form--inline {
|
||||||
|
.el-form-item {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Page section spacing between stacked cards */
|
||||||
|
.el-card + .el-card {
|
||||||
|
margin-top: 16px;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
@import 'element.scss';
|
|
||||||
@import 'dark.css';
|
|
||||||
@import 'var.css';
|
@import 'var.css';
|
||||||
|
@import 'dark.css';
|
||||||
@import 'tailwind.css';
|
@import 'tailwind.css';
|
||||||
|
@import 'element.scss';
|
||||||
|
@import 'admin-shell.scss';
|
||||||
|
@import 'admin-pages.scss';
|
||||||
@import 'public.scss';
|
@import 'public.scss';
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
body {
|
body {
|
||||||
@apply text-base text-tx-primary overflow-hidden min-w-[375px];
|
@apply text-base text-tx-primary overflow-hidden min-w-[375px];
|
||||||
|
font-feature-settings: 'kern' 1;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-tips {
|
.form-tips {
|
||||||
@apply text-tx-secondary text-xs leading-6 mt-1;
|
@apply text-tx-secondary text-xs leading-6 mt-1;
|
||||||
}
|
}
|
||||||
@@ -12,7 +16,51 @@ body {
|
|||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Scrollbar */
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background: var(--el-border-color);
|
||||||
|
border-radius: 999px;
|
||||||
|
border: 2px solid transparent;
|
||||||
|
background-clip: content-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb:hover {
|
||||||
|
background: var(--el-border-color-dark);
|
||||||
|
background-clip: content-box;
|
||||||
|
}
|
||||||
|
|
||||||
/* NProgress */
|
/* NProgress */
|
||||||
#nprogress .bar {
|
#nprogress .bar {
|
||||||
@apply bg-primary #{!important};
|
@apply bg-primary #{!important};
|
||||||
|
height: 2px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#nprogress .peg {
|
||||||
|
box-shadow: 0 0 8px var(--el-color-primary), 0 0 4px var(--el-color-primary) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Shared page utilities */
|
||||||
|
.admin-page-title {
|
||||||
|
@apply text-xl font-semibold text-tx-primary tracking-tight;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-page-desc {
|
||||||
|
@apply text-sm text-tx-secondary mt-1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-value {
|
||||||
|
@apply text-3xl font-semibold text-tx-primary tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-stat-label {
|
||||||
|
@apply text-sm text-tx-secondary;
|
||||||
}
|
}
|
||||||
|
|||||||
+85
-35
@@ -1,49 +1,99 @@
|
|||||||
:root {
|
:root {
|
||||||
|
/* Typography */
|
||||||
--el-font-family: theme(fontFamily.sans);
|
--el-font-family: theme(fontFamily.sans);
|
||||||
--el-font-weight-primary: 400;
|
--el-font-weight-primary: 400;
|
||||||
--el-menu-item-height: 46px;
|
|
||||||
--el-menu-sub-item-height: var(--el-menu-item-height);
|
|
||||||
--el-menu-icon-width: 18px;
|
|
||||||
--aside-width: 200px;
|
|
||||||
--navbar-height: 50px;
|
|
||||||
--color-white: #ffffff;
|
|
||||||
--table-header-bg-color: #f8f8f8;
|
|
||||||
--el-font-size-extra-large: 18px;
|
--el-font-size-extra-large: 18px;
|
||||||
--el-menu-base-level-padding: 16px;
|
|
||||||
--el-menu-level-padding: 26px;
|
|
||||||
--el-font-size-large: 16px;
|
--el-font-size-large: 16px;
|
||||||
--el-font-size-medium: 15px;
|
--el-font-size-medium: 15px;
|
||||||
--el-font-size-base: 14px;
|
--el-font-size-base: 14px;
|
||||||
--el-font-size-small: 13px;
|
--el-font-size-small: 13px;
|
||||||
--el-font-size-extra-small: 12px;
|
--el-font-size-extra-small: 12px;
|
||||||
|
|
||||||
|
/* Brand - MedTech 绚丽临床 */
|
||||||
|
--admin-brand-primary: #06b6d4;
|
||||||
|
--admin-brand-primary-dark: #0891b2;
|
||||||
|
--admin-brand-accent: #10b981;
|
||||||
|
--admin-brand-secondary: #6366f1;
|
||||||
|
--admin-brand-success: #10b981;
|
||||||
|
--admin-brand-gradient: linear-gradient(120deg, #06b6d4 0%, #10b981 48%, #0891b2 100%);
|
||||||
|
--admin-brand-gradient-soft: linear-gradient(
|
||||||
|
120deg,
|
||||||
|
rgba(6, 182, 212, 0.16) 0%,
|
||||||
|
rgba(16, 185, 129, 0.1) 50%,
|
||||||
|
rgba(8, 145, 178, 0.08) 100%
|
||||||
|
);
|
||||||
|
--admin-brand-glow: 0 0 24px rgba(6, 182, 212, 0.35);
|
||||||
|
--admin-brand-mesh-a: rgba(6, 182, 212, 0.18);
|
||||||
|
--admin-brand-mesh-b: rgba(16, 185, 129, 0.14);
|
||||||
|
--admin-brand-mesh-c: rgba(99, 102, 241, 0.1);
|
||||||
|
|
||||||
|
/* Layout shell v2 */
|
||||||
|
--aside-width: 248px;
|
||||||
|
--navbar-height: 60px;
|
||||||
|
--tabs-height: 42px;
|
||||||
|
--stage-padding-x: 28px;
|
||||||
|
--stage-padding-y: 24px;
|
||||||
|
--content-max-width: 1680px;
|
||||||
|
--sidebar-rail-width: 3px;
|
||||||
|
|
||||||
|
/* Shape */
|
||||||
|
--admin-radius-sm: 8px;
|
||||||
|
--admin-radius-md: 12px;
|
||||||
|
--admin-radius-lg: 16px;
|
||||||
|
--admin-radius-xl: 22px;
|
||||||
|
--admin-radius-2xl: 28px;
|
||||||
|
--el-border-radius-base: var(--admin-radius-md);
|
||||||
|
--el-border-radius-small: var(--admin-radius-sm);
|
||||||
|
--el-border-radius-round: 999px;
|
||||||
|
|
||||||
|
/* Menu */
|
||||||
|
--el-menu-item-height: 46px;
|
||||||
|
--el-menu-sub-item-height: var(--el-menu-item-height);
|
||||||
|
--el-menu-icon-width: 20px;
|
||||||
|
--el-menu-base-level-padding: 14px;
|
||||||
|
--el-menu-level-padding: 22px;
|
||||||
|
|
||||||
|
/* Surfaces */
|
||||||
|
--color-white: #ffffff;
|
||||||
|
--table-header-bg-color: rgba(6, 182, 212, 0.06);
|
||||||
|
--sidebar-dark-bg: #060d18;
|
||||||
|
--sidebar-dark-hover: rgba(255, 255, 255, 0.05);
|
||||||
|
--sidebar-dark-active: rgba(6, 182, 212, 0.14);
|
||||||
|
--admin-surface-elevated: #ffffff;
|
||||||
|
--admin-surface-muted: rgba(255, 255, 255, 0.72);
|
||||||
|
--admin-surface-glass: rgba(255, 255, 255, 0.82);
|
||||||
|
|
||||||
--el-bg-color: var(--color-white);
|
--el-bg-color: var(--color-white);
|
||||||
--el-bg-color-page: #f6f6f6;
|
--el-bg-color-page: #eef6fb;
|
||||||
--el-bg-color-overlay: #ffffff;
|
--el-bg-color-overlay: #ffffff;
|
||||||
--el-text-color-primary: #333333;
|
--el-text-color-primary: #0b1220;
|
||||||
--el-text-color-regular: #666666;
|
--el-text-color-regular: #334155;
|
||||||
--el-text-color-secondary: #999999;
|
--el-text-color-secondary: #64748b;
|
||||||
--el-text-color-placeholder: #a8abb2;
|
--el-text-color-placeholder: #94a3b8;
|
||||||
--el-text-color-disabled: #c0c4cc;
|
--el-text-color-disabled: #cbd5e1;
|
||||||
--el-border-color: #dcdfe6;
|
--el-border-color: rgba(6, 182, 212, 0.12);
|
||||||
--el-border-color-light: #e4e7ed;
|
--el-border-color-light: rgba(6, 182, 212, 0.08);
|
||||||
--el-border-color-lighter: #ebeef5;
|
--el-border-color-lighter: rgba(15, 23, 42, 0.06);
|
||||||
--el-border-color-extra-light: #f2f2f2;
|
--el-border-color-extra-light: rgba(15, 23, 42, 0.04);
|
||||||
--el-border-color-dark: #d4d7de;
|
--el-border-color-dark: #cbd5e1;
|
||||||
--el-border-color-darker: #cdd0d6;
|
--el-border-color-darker: #94a3b8;
|
||||||
--el-fill-color: #f0f2f5;
|
--el-fill-color: #f1f5f9;
|
||||||
--el-fill-color-light: #f8f8f8;
|
--el-fill-color-light: #f8fafc;
|
||||||
--el-fill-color-lighter: #fafafa;
|
--el-fill-color-lighter: #fafbfc;
|
||||||
--el-fill-color-extra-light: #fafcff;
|
--el-fill-color-extra-light: #fcfdfe;
|
||||||
--el-fill-color-dark: #ebedf0;
|
--el-fill-color-dark: #e2e8f0;
|
||||||
--el-fill-color-darker: #e6e8eb;
|
--el-fill-color-darker: #cbd5e1;
|
||||||
--el-fill-color-blank: #ffffff;
|
--el-fill-color-blank: #ffffff;
|
||||||
/* 过亮会盖住抽屉/弹窗下的内容；Element Loading 与部分蒙层共用此变量 */
|
|
||||||
--el-mask-color: rgba(255, 255, 255, 0.5);
|
--el-mask-color: rgba(6, 13, 24, 0.55);
|
||||||
--el-mask-color-extra-light: rgba(255, 255, 255, 0.22);
|
--el-mask-color-extra-light: rgba(6, 13, 24, 0.1);
|
||||||
-el-box-shadow: 0px 12px 32px 4px rgba(0, 0, 0, 0.04), 0px 8px 20px rgba(0, 0, 0, 0.08);
|
|
||||||
--el-box-shadow-light: 0px 0px 12px rgba(0, 0, 0, 0.12);
|
--el-box-shadow: 0 4px 24px rgba(6, 182, 212, 0.08), 0 12px 40px rgba(15, 23, 42, 0.06);
|
||||||
--el-box-shadow-lighter: 0px 0px 6px rgba(0, 0, 0, 0.12);
|
--el-box-shadow-light: 0 2px 16px rgba(6, 182, 212, 0.1);
|
||||||
--el-box-shadow-dark: 0px 16px 48px 16px rgba(0, 0, 0, 0.08), 0px 12px 32px rgba(0, 0, 0, 0.12),
|
--el-box-shadow-lighter: 0 1px 4px rgba(15, 23, 42, 0.04);
|
||||||
0px 8px 16px -8px rgba(0, 0, 0, 0.16);
|
--el-box-shadow-dark: 0 16px 48px rgba(6, 182, 212, 0.14), 0 32px 64px rgba(15, 23, 42, 0.1);
|
||||||
|
|
||||||
|
--admin-header-border: rgba(6, 182, 212, 0.1);
|
||||||
|
--admin-sidebar-border: rgba(255, 255, 255, 0.06);
|
||||||
|
--admin-stage-bg: transparent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="change-password flex flex-col">
|
<div class="change-password flex flex-col">
|
||||||
<div class="flex-1 flex items-center justify-center">
|
<div class="change-password-backdrop" aria-hidden="true"></div>
|
||||||
<div class="change-password-card bg-body rounded-md px-10 py-10 w-[480px]">
|
<div class="flex-1 flex items-center justify-center relative z-[1] px-4">
|
||||||
<div class="text-center text-2xl font-medium mb-2">首次登录</div>
|
<div class="change-password-card">
|
||||||
<div class="text-center text-gray-500 text-sm mb-8">为了您的账号安全，请修改初始密码</div>
|
<div class="text-center text-2xl font-semibold mb-2 text-tx-primary">首次登录</div>
|
||||||
|
<div class="text-center text-tx-secondary text-sm mb-8">为了您的账号安全，请修改初始密码</div>
|
||||||
|
|
||||||
<el-form ref="formRef" :model="formData" size="large" :rules="rules">
|
<el-form ref="formRef" :model="formData" size="large" :rules="rules">
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="password">
|
||||||
@@ -117,7 +118,25 @@ const { isLock, lockFn: lockSubmit } = useLockFn(handleSubmit)
|
|||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.change-password {
|
.change-password {
|
||||||
background-image: url('./images/login_bg.png');
|
position: relative;
|
||||||
@apply min-h-screen bg-no-repeat bg-center bg-cover;
|
min-height: 100vh;
|
||||||
|
background: #0f172a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.change-password-backdrop {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background:
|
||||||
|
radial-gradient(circle at 15% 20%, rgba(15, 118, 110, 0.35), transparent 42%),
|
||||||
|
linear-gradient(160deg, #0f172a 0%, #111827 48%, #0b1120 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.change-password-card {
|
||||||
|
width: min(480px, 100%);
|
||||||
|
padding: 40px 36px;
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
box-shadow: 0 24px 64px rgba(2, 6, 23, 0.45);
|
||||||
|
background: var(--el-bg-color);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,33 +1,41 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="login flex flex-col">
|
<div class="login-v2">
|
||||||
<div class="flex-1 flex items-center justify-center">
|
<div class="login-v2__mesh" aria-hidden="true"></div>
|
||||||
<div class="login-card flex rounded-md overflow-hidden">
|
<div class="login-v2__layout">
|
||||||
<div class="flex-1 h-full hidden md:inline-block">
|
<aside class="login-v2__brand">
|
||||||
<image-contain :src="config.login_image" :width="400" height="100%" />
|
<div class="login-v2__brand-inner">
|
||||||
|
<div class="login-v2__mark">ZYT</div>
|
||||||
|
<p class="login-v2__kicker">互联网医院</p>
|
||||||
|
<h1 class="login-v2__headline">医生与医助<br />智慧工作台</h1>
|
||||||
|
<p class="login-v2__lead">问诊、处方、订单与运营数据，一屏协同。</p>
|
||||||
|
<div v-if="config.login_image" class="login-v2__visual hidden xl:block">
|
||||||
|
<image-contain :src="config.login_image" :width="420" height="280" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
</aside>
|
||||||
class="login-form bg-body flex flex-col justify-center px-10 py-10 md:w-[420px] w-[380px] flex-none mx-auto"
|
|
||||||
>
|
|
||||||
<div class="text-center text-3xl font-medium mb-8">{{ config.web_name }}</div>
|
|
||||||
|
|
||||||
<!-- 企业微信自动授权中 -->
|
<section class="login-v2__panel">
|
||||||
<div v-if="wxWorkAutoLogin" class="text-center py-10">
|
<div class="login-v2__glass">
|
||||||
|
<div class="login-v2__form-head">
|
||||||
|
<h2 class="login-v2__form-title">{{ config.web_name }}</h2>
|
||||||
|
<p class="login-v2__form-sub">登录后继续你的接诊与管理工作</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="wxWorkAutoLogin" class="login-v2__loading">
|
||||||
<el-icon class="is-loading mb-4" :size="40" color="var(--el-color-primary)">
|
<el-icon class="is-loading mb-4" :size="40" color="var(--el-color-primary)">
|
||||||
<Loading />
|
<Loading />
|
||||||
</el-icon>
|
</el-icon>
|
||||||
<div class="text-gray-500">企业微信授权登录中...</div>
|
<div class="text-tx-secondary">企业微信授权登录中...</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<!-- 登录方式切换标签 -->
|
<div v-if="wxWorkEnabled" class="login-v2__mode">
|
||||||
<div v-if="wxWorkEnabled" class="flex justify-center mb-6">
|
|
||||||
<el-radio-group v-model="loginMode" size="large">
|
<el-radio-group v-model="loginMode" size="large">
|
||||||
<el-radio-button value="account">账号登录</el-radio-button>
|
<el-radio-button value="account">账号登录</el-radio-button>
|
||||||
<el-radio-button value="wxwork">企业微信</el-radio-button>
|
<el-radio-button value="wxwork">企业微信</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 账号密码登录 -->
|
|
||||||
<template v-if="loginMode === 'account'">
|
<template v-if="loginMode === 'account'">
|
||||||
<el-form ref="formRef" :model="formData" size="large" :rules="rules">
|
<el-form ref="formRef" :model="formData" size="large" :rules="rules">
|
||||||
<el-form-item prop="account">
|
<el-form-item prop="account">
|
||||||
@@ -58,29 +66,34 @@
|
|||||||
<div class="mb-5">
|
<div class="mb-5">
|
||||||
<el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
|
<el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
|
||||||
</div>
|
</div>
|
||||||
<el-button type="primary" size="large" :loading="isLock" @click="lockLogin">
|
<el-button
|
||||||
登录
|
class="login-v2__submit"
|
||||||
|
type="primary"
|
||||||
|
size="large"
|
||||||
|
:loading="isLock"
|
||||||
|
@click="lockLogin"
|
||||||
|
>
|
||||||
|
进入工作台
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- 企业微信扫码登录（非企业微信内浏览器） -->
|
|
||||||
<template v-if="loginMode === 'wxwork'">
|
<template v-if="loginMode === 'wxwork'">
|
||||||
<div class="wxwork-qrcode-wrap">
|
<div class="wxwork-qrcode-wrap">
|
||||||
<div v-if="wxWorkLoading" class="text-center py-10">
|
<div v-if="wxWorkLoading" class="text-center py-10">
|
||||||
<el-icon class="is-loading" :size="32" color="var(--el-color-primary)">
|
<el-icon class="is-loading" :size="32" color="var(--el-color-primary)">
|
||||||
<Loading />
|
<Loading />
|
||||||
</el-icon>
|
</el-icon>
|
||||||
<div class="mt-2 text-gray-400 text-sm">加载企业微信扫码...</div>
|
<div class="mt-2 text-tx-secondary text-sm">加载企业微信扫码...</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else id="wxwork_qrcode_container" class="wxwork-qrcode"></div>
|
<div v-else id="wxwork_qrcode_container" class="wxwork-qrcode"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center text-sm text-gray-400 mt-4">
|
<div class="text-center text-sm text-tx-secondary mt-4">
|
||||||
请使用企业微信扫描二维码登录
|
请使用企业微信扫描二维码登录
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<layout-footer />
|
<layout-footer />
|
||||||
</div>
|
</div>
|
||||||
@@ -286,31 +299,178 @@ onMounted(async () => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.login {
|
.login-v2 {
|
||||||
background-image: url('./images/login_bg.png');
|
position: relative;
|
||||||
@apply min-h-screen bg-no-repeat bg-center bg-cover;
|
min-height: 100vh;
|
||||||
.login-card {
|
display: flex;
|
||||||
height: auto;
|
flex-direction: column;
|
||||||
min-height: 400px;
|
background: #030712;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__mesh {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background:
|
||||||
|
radial-gradient(circle at 12% 18%, rgba(6, 182, 212, 0.35), transparent 42%),
|
||||||
|
radial-gradient(circle at 88% 12%, rgba(16, 185, 129, 0.28), transparent 38%),
|
||||||
|
radial-gradient(circle at 70% 88%, rgba(99, 102, 241, 0.18), transparent 40%),
|
||||||
|
linear-gradient(155deg, #030712 0%, #0b1220 45%, #060d18 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__layout {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
flex: 1;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
min-height: calc(100vh - 48px);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1024px) {
|
||||||
|
.login-v2__layout {
|
||||||
|
grid-template-columns: minmax(0, 1.05fr) minmax(420px, 520px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.login-v2__brand {
|
||||||
|
display: none;
|
||||||
|
padding: 48px 56px;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1024px) {
|
||||||
|
.login-v2__brand {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__brand-inner {
|
||||||
|
max-width: 520px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__mark {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
border-radius: 14px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 800;
|
||||||
|
letter-spacing: 0.1em;
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
box-shadow: var(--admin-brand-glow);
|
||||||
|
margin-bottom: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__kicker {
|
||||||
|
margin: 0 0 12px;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.14em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: rgba(255, 255, 255, 0.72);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__headline {
|
||||||
|
margin: 0;
|
||||||
|
font-size: clamp(32px, 4vw, 44px);
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1.15;
|
||||||
|
letter-spacing: -0.03em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__lead {
|
||||||
|
margin: 16px 0 0;
|
||||||
|
font-size: 16px;
|
||||||
|
line-height: 1.6;
|
||||||
|
color: rgba(255, 255, 255, 0.72);
|
||||||
|
max-width: 36ch;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__visual {
|
||||||
|
margin-top: 36px;
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
overflow: hidden;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.12);
|
||||||
|
box-shadow: 0 24px 64px rgba(0, 0, 0, 0.35);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__panel {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 32px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__glass {
|
||||||
|
width: min(440px, 100%);
|
||||||
|
padding: 36px 32px;
|
||||||
|
border-radius: var(--admin-radius-2xl);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.14);
|
||||||
|
background: rgba(255, 255, 255, 0.92);
|
||||||
|
backdrop-filter: blur(24px) saturate(160%);
|
||||||
|
box-shadow: var(--el-box-shadow-dark);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__form-head {
|
||||||
|
margin-bottom: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__form-title {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 26px;
|
||||||
|
font-weight: 800;
|
||||||
|
letter-spacing: -0.02em;
|
||||||
|
color: var(--el-text-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__form-sub {
|
||||||
|
margin: 8px 0 0;
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--el-text-color-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__mode {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__submit {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-v2__loading {
|
||||||
|
text-align: center;
|
||||||
|
padding: 40px 0;
|
||||||
|
}
|
||||||
|
|
||||||
.wxwork-qrcode-wrap {
|
.wxwork-qrcode-wrap {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
min-height: 400px;
|
min-height: 360px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wxwork-qrcode {
|
.wxwork-qrcode {
|
||||||
width: 340px;
|
width: 320px;
|
||||||
height: 400px;
|
height: 360px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
:deep(iframe) {
|
:deep(iframe) {
|
||||||
width: 340px !important;
|
width: 320px !important;
|
||||||
height: 400px !important;
|
height: 360px !important;
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-transparency: reduce) {
|
||||||
|
.login-v2__glass {
|
||||||
|
background: #ffffff;
|
||||||
|
backdrop-filter: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="warning"
|
type="warning"
|
||||||
title="温馨提示：用于管理网站的分类，只可添加到一级"
|
title="温馨提示：用于管理网站的分类，只可添加到一级"
|
||||||
:closable="false"
|
:closable="false"
|
||||||
show-icon
|
show-icon
|
||||||
/>
|
/>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never" v-loading="pager.loading">
|
|
||||||
<div>
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
|
<template #toolbar>
|
||||||
<el-button
|
<el-button
|
||||||
class="mb-4"
|
|
||||||
v-perms="['article.articleCate/add']"
|
v-perms="['article.articleCate/add']"
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="handleAdd()"
|
@click="handleAdd()"
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
</template>
|
</template>
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</template>
|
||||||
<el-table size="large" :data="pager.lists">
|
<el-table size="large" :data="pager.lists">
|
||||||
<el-table-column label="栏目名称" prop="name" min-width="120" />
|
<el-table-column label="栏目名称" prop="name" min-width="120" />
|
||||||
<el-table-column label="文章数" prop="article_count" min-width="120" />
|
<el-table-column label="文章数" prop="article_count" min-width="120" />
|
||||||
@@ -58,10 +58,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="article-lists">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||||
<el-form-item class="w-[280px]" label="文章标题">
|
<el-form-item class="w-[280px]" label="文章标题">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -33,24 +33,25 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
<div>
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
|
<template #toolbar>
|
||||||
<router-link
|
<router-link
|
||||||
v-perms="['article.article/add', 'article.article/add:edit']"
|
v-perms="['article.article/add', 'article.article/add:edit']"
|
||||||
:to="{
|
:to="{
|
||||||
path: getRoutePath('article.article/add:edit')
|
path: getRoutePath('article.article/add:edit')
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<el-button type="primary" class="mb-4">
|
<el-button type="primary">
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<icon name="el-icon-Plus" />
|
<icon name="el-icon-Plus" />
|
||||||
</template>
|
</template>
|
||||||
发布文章
|
发布文章
|
||||||
</el-button>
|
</el-button>
|
||||||
</router-link>
|
</router-link>
|
||||||
</div>
|
</template>
|
||||||
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
|
<el-table size="large" :data="pager.lists">
|
||||||
<el-table-column label="ID" prop="id" min-width="80" />
|
<el-table-column label="ID" prop="id" min-width="80" />
|
||||||
<el-table-column label="封面" min-width="100">
|
<el-table-column label="封面" min-width="100">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
@@ -116,10 +117,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup name="articleLists">
|
<script lang="ts" setup name="articleLists">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="asset-resource-container">
|
<div class="asset-resource-container">
|
||||||
<!-- 搜索区域 -->
|
<!-- 搜索区域 -->
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form class="ls-form" :model="searchData" inline>
|
<el-form class="ls-form" :model="searchData" inline>
|
||||||
<el-form-item class="w-[280px]" label="标题">
|
<el-form-item class="w-[280px]" label="标题">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -28,17 +28,17 @@
|
|||||||
<el-button @click="handleReset">重置</el-button>
|
<el-button @click="handleReset">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
|
|
||||||
<!-- 列表区域 -->
|
<!-- 列表区域 -->
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="loading">
|
||||||
<div class="mb-4 flex items-center gap-2">
|
<template #toolbar>
|
||||||
<el-button type="primary" @click="handleAdd">上传资源</el-button>
|
<el-button type="primary" @click="handleAdd">上传资源</el-button>
|
||||||
<el-button type="danger" :disabled="selectedIds.length === 0" @click="handleBatchDelete">
|
<el-button type="danger" :disabled="selectedIds.length === 0" @click="handleBatchDelete">
|
||||||
批量删除
|
批量删除
|
||||||
</el-button>
|
</el-button>
|
||||||
<span v-if="selectedIds.length > 0" class="text-sm text-gray-500">已选 {{ selectedIds.length }} 条</span>
|
<span v-if="selectedIds.length > 0" class="text-sm text-gray-500">已选 {{ selectedIds.length }} 条</span>
|
||||||
</div>
|
</template>
|
||||||
|
|
||||||
<el-tabs v-model="queryParams.type" @tab-change="handleTabChange">
|
<el-tabs v-model="queryParams.type" @tab-change="handleTabChange">
|
||||||
<el-tab-pane label="图片" name="1"></el-tab-pane>
|
<el-tab-pane label="图片" name="1"></el-tab-pane>
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
<el-tab-pane label="语音" name="3"></el-tab-pane>
|
<el-tab-pane label="语音" name="3"></el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
|
|
||||||
<el-table :data="tableData" v-loading="loading" @selection-change="handleSelectionChange">
|
<el-table :data="tableData" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" />
|
<el-table-column type="selection" width="55" />
|
||||||
<!-- <el-table-column prop="id" label="ID" width="80" /> -->
|
<!-- <el-table-column prop="id" label="ID" width="80" /> -->
|
||||||
<el-table-column prop="title" label="标题" min-width="80" />
|
<el-table-column prop="title" label="标题" min-width="80" />
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<div class="mt-4 flex justify-end">
|
<template #footer>
|
||||||
<el-pagination
|
<el-pagination
|
||||||
v-model:current-page="queryParams.page_no"
|
v-model:current-page="queryParams.page_no"
|
||||||
v-model:page-size="queryParams.page_size"
|
v-model:page-size="queryParams.page_size"
|
||||||
@@ -80,8 +80,8 @@
|
|||||||
@size-change="getList"
|
@size-change="getList"
|
||||||
@current-change="getList"
|
@current-change="getList"
|
||||||
/>
|
/>
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
|
|
||||||
<!-- 新增/编辑资源弹窗 -->
|
<!-- 新增/编辑资源弹窗 -->
|
||||||
<el-dialog v-model="dialogVisible" :title="isEdit ? '编辑资源' : '新增分发资源'" width="600px" destroy-on-close>
|
<el-dialog v-model="dialogVisible" :title="isEdit ? '编辑资源' : '新增分发资源'" width="600px" destroy-on-close>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="asset-user-container">
|
<div class="asset-user-container">
|
||||||
<!-- 搜索区域 -->
|
<!-- 搜索区域 -->
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form class="ls-form" :model="searchData" inline>
|
<el-form class="ls-form" :model="searchData" inline>
|
||||||
<el-form-item class="w-[280px]" label="手机号">
|
<el-form-item class="w-[280px]" label="手机号">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -16,15 +16,15 @@
|
|||||||
<el-button @click="handleReset">重置</el-button>
|
<el-button @click="handleReset">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
|
|
||||||
<!-- 列表区域 -->
|
<!-- 列表区域 -->
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="loading">
|
||||||
<div class="mb-4">
|
<template #toolbar>
|
||||||
<el-button type="primary" @click="handleAdd">新增账号</el-button>
|
<el-button type="primary" @click="handleAdd">新增账号</el-button>
|
||||||
</div>
|
</template>
|
||||||
|
|
||||||
<el-table :data="tableData" v-loading="loading">
|
<el-table :data="tableData">
|
||||||
<!-- <el-table-column prop="id" label="ID" width="80" /> -->
|
<!-- <el-table-column prop="id" label="ID" width="80" /> -->
|
||||||
<el-table-column prop="phone" label="手机号" />
|
<el-table-column prop="phone" label="手机号" />
|
||||||
<el-table-column label="备注" min-width="200">
|
<el-table-column label="备注" min-width="200">
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<div class="mt-4 flex justify-end">
|
<template #footer>
|
||||||
<el-pagination
|
<el-pagination
|
||||||
v-model:current-page="queryParams.page_no"
|
v-model:current-page="queryParams.page_no"
|
||||||
v-model:page-size="queryParams.page_size"
|
v-model:page-size="queryParams.page_size"
|
||||||
@@ -72,8 +72,8 @@
|
|||||||
@size-change="getList"
|
@size-change="getList"
|
||||||
@current-change="getList"
|
@current-change="getList"
|
||||||
/>
|
/>
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
|
|
||||||
<!-- 编辑/新增弹窗 -->
|
<!-- 编辑/新增弹窗 -->
|
||||||
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px" destroy-on-close>
|
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px" destroy-on-close>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||||
<el-form-item class="w-[280px]" label="用户信息">
|
<el-form-item class="w-[280px]" label="用户信息">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -37,8 +37,9 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
|
<admin-page-data-panel>
|
||||||
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
|
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
|
||||||
<el-table-column label="头像" min-width="100">
|
<el-table-column label="头像" min-width="100">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
@@ -67,10 +68,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup name="consumerLists">
|
<script lang="ts" setup name="consumerLists">
|
||||||
|
|||||||
+28
-407
@@ -327,27 +327,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item>
|
<el-descriptions-item label="服用方式">
|
||||||
<template #label>
|
|
||||||
<div class="flex items-center gap-1">
|
|
||||||
<span>服用方式</span>
|
|
||||||
<el-button
|
|
||||||
v-if="
|
|
||||||
!readonly &&
|
|
||||||
detailData.prescription_id &&
|
|
||||||
detailPrescription &&
|
|
||||||
!String(detailData.prescription_detail_error || '').trim()
|
|
||||||
"
|
|
||||||
v-perms="['tcm.prescriptionOrder/patchPrescriptionUsage']"
|
|
||||||
type="primary"
|
|
||||||
size="small"
|
|
||||||
link
|
|
||||||
@click="openPatchUsageDialog"
|
|
||||||
>
|
|
||||||
修改
|
|
||||||
</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-1.5 text-sm leading-relaxed">
|
<div class="flex flex-col gap-1.5 text-sm leading-relaxed">
|
||||||
<template v-if="detailHasAuxHerbs">
|
<template v-if="detailHasAuxHerbs">
|
||||||
<div>
|
<div>
|
||||||
@@ -651,7 +631,7 @@
|
|||||||
<el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
|
<el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
|
||||||
|
|
||||||
<el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
|
<el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="服务套餐">{{ detailServicePackageText }}</el-descriptions-item>
|
<el-descriptions-item label="服务套餐">{{ formatServicePackage(detailData.service_package) }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
|
<el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
|
||||||
|
|
||||||
<el-descriptions-item v-if="showInternalCost" label="内部成本">
|
<el-descriptions-item v-if="showInternalCost" label="内部成本">
|
||||||
@@ -800,18 +780,7 @@
|
|||||||
class="po-panel border-gray-100 mt-4"
|
class="po-panel border-gray-100 mt-4"
|
||||||
>
|
>
|
||||||
<template #header>
|
<template #header>
|
||||||
<div class="flex items-center justify-between gap-2">
|
<span class="font-medium text-[15px]">操作日志</span>
|
||||||
<span class="font-medium text-[15px]">操作日志</span>
|
|
||||||
<el-button
|
|
||||||
v-if="canAddPrescriptionOrderLog()"
|
|
||||||
type="primary"
|
|
||||||
link
|
|
||||||
size="small"
|
|
||||||
@click="openAddLogDialog"
|
|
||||||
>
|
|
||||||
新增日志
|
|
||||||
</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
<el-timeline v-if="detailLogs.length" class="mt-2 pl-2">
|
<el-timeline v-if="detailLogs.length" class="mt-2 pl-2">
|
||||||
<el-timeline-item
|
<el-timeline-item
|
||||||
@@ -831,182 +800,19 @@
|
|||||||
</el-timeline>
|
</el-timeline>
|
||||||
<el-empty v-else description="暂无操作日志" :image-size="64" />
|
<el-empty v-else description="暂无操作日志" :image-size="64" />
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<!-- 新增操作日志 -->
|
|
||||||
<el-dialog
|
|
||||||
v-model="addLogVisible"
|
|
||||||
title="新增操作日志"
|
|
||||||
width="520px"
|
|
||||||
:close-on-click-modal="false"
|
|
||||||
destroy-on-close
|
|
||||||
append-to-body
|
|
||||||
@closed="resetAddLogForm"
|
|
||||||
>
|
|
||||||
<el-form ref="addLogFormRef" :model="addLogForm" :rules="addLogRules" label-width="108px">
|
|
||||||
<el-form-item label="日志内容" prop="summary">
|
|
||||||
<el-input
|
|
||||||
v-model="addLogForm.summary"
|
|
||||||
type="textarea"
|
|
||||||
:rows="4"
|
|
||||||
maxlength="500"
|
|
||||||
show-word-limit
|
|
||||||
placeholder="记录本次操作说明、沟通结果等"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="canSetRxAuditOnAddLog" label="处方审核">
|
|
||||||
<el-select v-model="addLogForm.prescription_audit_status" class="w-full" clearable placeholder="不修改">
|
|
||||||
<el-option label="待审核" :value="0" />
|
|
||||||
<el-option label="已通过" :value="1" />
|
|
||||||
<el-option label="已驳回" :value="2" />
|
|
||||||
</el-select>
|
|
||||||
<div v-if="detailData" class="text-xs text-gray-400 mt-1">
|
|
||||||
当前：{{ auditStatusText(detailData.prescription_audit_status) }}
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
|
||||||
v-if="canSetRxAuditOnAddLog && addLogForm.prescription_audit_status !== '' && addLogForm.prescription_audit_status !== null && addLogForm.prescription_audit_status !== undefined"
|
|
||||||
label="处方审核意见"
|
|
||||||
>
|
|
||||||
<el-input
|
|
||||||
v-model="addLogForm.prescription_audit_remark"
|
|
||||||
type="textarea"
|
|
||||||
:rows="2"
|
|
||||||
maxlength="500"
|
|
||||||
show-word-limit
|
|
||||||
placeholder="选填"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="canSetPayAuditOnAddLog" label="支付单审核">
|
|
||||||
<el-select v-model="addLogForm.payment_slip_audit_status" class="w-full" clearable placeholder="不修改">
|
|
||||||
<el-option label="待审核" :value="0" />
|
|
||||||
<el-option label="已通过" :value="1" />
|
|
||||||
<el-option label="已驳回" :value="2" />
|
|
||||||
</el-select>
|
|
||||||
<div v-if="detailData" class="text-xs text-gray-400 mt-1">
|
|
||||||
当前：{{ auditStatusText(detailData.payment_slip_audit_status) }}
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
|
||||||
v-if="canSetPayAuditOnAddLog && addLogForm.payment_slip_audit_status !== '' && addLogForm.payment_slip_audit_status !== null && addLogForm.payment_slip_audit_status !== undefined"
|
|
||||||
label="支付审核意见"
|
|
||||||
>
|
|
||||||
<el-input
|
|
||||||
v-model="addLogForm.payment_slip_audit_remark"
|
|
||||||
type="textarea"
|
|
||||||
:rows="2"
|
|
||||||
maxlength="500"
|
|
||||||
show-word-limit
|
|
||||||
placeholder="选填"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="addLogVisible = false">取消</el-button>
|
|
||||||
<el-button type="primary" :loading="addLogSaving" @click="submitAddLog">保存</el-button>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
|
|
||||||
<!-- 修改服用参数：主方 / 辅方 / 订单设置 -->
|
|
||||||
<el-dialog
|
|
||||||
v-model="patchUsageVisible"
|
|
||||||
title="修改服用参数"
|
|
||||||
width="480px"
|
|
||||||
:close-on-click-modal="false"
|
|
||||||
destroy-on-close
|
|
||||||
@closed="resetPatchUsageForm"
|
|
||||||
>
|
|
||||||
<el-form
|
|
||||||
ref="patchUsageFormRef"
|
|
||||||
:model="patchUsageForm"
|
|
||||||
:rules="patchUsageRules"
|
|
||||||
label-width="108px"
|
|
||||||
>
|
|
||||||
<div v-if="detailHasAuxHerbs" class="text-xs font-medium text-gray-500 mb-3">主方</div>
|
|
||||||
<el-form-item label="每天次数" prop="times_per_day">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.times_per_day"
|
|
||||||
:min="1"
|
|
||||||
:max="6"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="w-full"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="处方开立" prop="usage_days">
|
|
||||||
<div class="flex items-center gap-1 w-full">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.usage_days"
|
|
||||||
:min="1"
|
|
||||||
:max="999"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
<span class="text-gray-500 shrink-0">天</span>
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
<template v-if="detailHasAuxHerbs">
|
|
||||||
<div class="text-xs font-medium text-gray-500 mb-3 mt-2 pt-2 border-t border-gray-100">辅方</div>
|
|
||||||
<el-form-item label="每天次数" prop="aux_times_per_day">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.aux_times_per_day"
|
|
||||||
:min="1"
|
|
||||||
:max="6"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="w-full"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="处方开立" prop="aux_usage_days">
|
|
||||||
<div class="flex items-center gap-1 w-full">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.aux_usage_days"
|
|
||||||
:min="1"
|
|
||||||
:max="999"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
<span class="text-gray-500 shrink-0">天</span>
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
</template>
|
|
||||||
<div class="text-xs font-medium text-gray-500 mb-3 mt-2 pt-2 border-t border-gray-100">订单设置</div>
|
|
||||||
<el-form-item label="服用天数" prop="medication_days">
|
|
||||||
<div class="flex items-center gap-1 w-full">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.medication_days"
|
|
||||||
:min="1"
|
|
||||||
:max="999"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
<span class="text-gray-500 shrink-0">天</span>
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="patchUsageVisible = false">取消</el-button>
|
|
||||||
<el-button type="primary" :loading="patchUsageSaving" @click="submitPatchUsage">保存</el-button>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup name="PrescriptionOrderDetailDrawer">
|
<script lang="ts" setup name="PrescriptionOrderDetailDrawer">
|
||||||
import { computed, nextTick, onMounted, reactive, ref } from 'vue'
|
import { computed, onMounted, ref } from 'vue'
|
||||||
import type { FormInstance, FormRules } from 'element-plus'
|
|
||||||
import { Refresh, Loading, Search, Van } from '@element-plus/icons-vue'
|
import { Refresh, Loading, Search, Van } from '@element-plus/icons-vue'
|
||||||
import {
|
import {
|
||||||
prescriptionOrderDetail,
|
prescriptionOrderDetail,
|
||||||
prescriptionOrderLogs,
|
prescriptionOrderLogs,
|
||||||
prescriptionOrderAddLog,
|
|
||||||
prescriptionOrderLogisticsTrace,
|
prescriptionOrderLogisticsTrace,
|
||||||
prescriptionOrderLogisticsJdUpdate,
|
prescriptionOrderLogisticsJdUpdate,
|
||||||
prescriptionOrderPaidPayOrders,
|
prescriptionOrderPaidPayOrders
|
||||||
prescriptionOrderPatchPrescriptionUsage
|
|
||||||
} from '@/api/tcm'
|
} from '@/api/tcm'
|
||||||
import { getDictData } from '@/api/app'
|
import { getDictData } from '@/api/app'
|
||||||
import feedback from '@/utils/feedback'
|
import feedback from '@/utils/feedback'
|
||||||
@@ -1025,7 +831,6 @@ import {
|
|||||||
consumerRxAuditTag,
|
consumerRxAuditTag,
|
||||||
expressCompanyLabel,
|
expressCompanyLabel,
|
||||||
logActionText,
|
logActionText,
|
||||||
auditStatusText,
|
|
||||||
formatPayOrderSource,
|
formatPayOrderSource,
|
||||||
normalizeBizPhone,
|
normalizeBizPhone,
|
||||||
recipientVsPrescriptionPhoneMismatch,
|
recipientVsPrescriptionPhoneMismatch,
|
||||||
@@ -1036,10 +841,7 @@ import {
|
|||||||
analyzeLogisticsPayloadUrgent,
|
analyzeLogisticsPayloadUrgent,
|
||||||
parseLogisticsTracePayload,
|
parseLogisticsTracePayload,
|
||||||
canUpdateAmount,
|
canUpdateAmount,
|
||||||
formatDietaryTaboo,
|
formatDietaryTaboo
|
||||||
type ServicePackageOption,
|
|
||||||
normalizeServicePackageOptions,
|
|
||||||
formatServicePackageLabels
|
|
||||||
} from './prescription-order-utils'
|
} from './prescription-order-utils'
|
||||||
|
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
@@ -1071,7 +873,6 @@ const emit = defineEmits<{
|
|||||||
(e: 'view-prescription'): void
|
(e: 'view-prescription'): void
|
||||||
(e: 'test-gancao-preview'): void
|
(e: 'test-gancao-preview'): void
|
||||||
(e: 'view-patient'): void
|
(e: 'view-patient'): void
|
||||||
(e: 'detail-changed'): void
|
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
@@ -1287,24 +1088,36 @@ const detailFullAddress = computed(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// ─── 服务套餐字典 ───
|
// ─── 服务套餐字典 ───
|
||||||
const servicePackageOptions = ref<ServicePackageOption[]>([])
|
const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
|
||||||
|
|
||||||
async function loadServicePackageOptions() {
|
async function loadServicePackageOptions() {
|
||||||
if (servicePackageOptions.value.length > 0) return
|
|
||||||
try {
|
try {
|
||||||
const data: any = await getDictData({ type: 'server_order' })
|
const data: any = await getDictData({ type: 'server_order' })
|
||||||
const opts = normalizeServicePackageOptions(data?.server_order)
|
servicePackageOptions.value = (data?.server_order || []).filter((item: any) => item.status !== 0)
|
||||||
if (opts.length > 0) {
|
|
||||||
servicePackageOptions.value = opts
|
|
||||||
}
|
|
||||||
} catch {
|
} catch {
|
||||||
/* 请求被同参数请求取消或失败时保留现值，open() 时会重试 */
|
servicePackageOptions.value = []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const detailServicePackageText = computed(() =>
|
function formatServicePackage(value: any): string {
|
||||||
formatServicePackageLabels(detailData.value?.service_package, servicePackageOptions.value)
|
if (!value) return '—'
|
||||||
)
|
|
||||||
|
let packages: string[] = []
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
packages = value
|
||||||
|
} else if (typeof value === 'string') {
|
||||||
|
packages = value.split(',').filter((v) => v.trim() !== '')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (packages.length === 0) return '—'
|
||||||
|
|
||||||
|
const names = packages.map((val) => {
|
||||||
|
const option = servicePackageOptions.value.find((opt) => opt.value === val)
|
||||||
|
return option ? option.name : val
|
||||||
|
})
|
||||||
|
|
||||||
|
return names.join('、')
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadServicePackageOptions()
|
loadServicePackageOptions()
|
||||||
@@ -1329,196 +1142,6 @@ async function fetchLogs(id: number) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function hasPerm(perm: string) {
|
|
||||||
const p = userStore.perms || []
|
|
||||||
return p.includes('*') || p.includes(perm)
|
|
||||||
}
|
|
||||||
|
|
||||||
function canAddPrescriptionOrderLog() {
|
|
||||||
return hasPerm('tcm.prescriptionOrder/addLog')
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 与后端 canAuditPrescriptionOrder 同档：超管或 prescription_audit_roles */
|
|
||||||
const canSetRxAuditOnAddLog = computed(() => {
|
|
||||||
const u = userStore.userInfo
|
|
||||||
if (!u || Number(u.root) === 1) return true
|
|
||||||
const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
|
|
||||||
return ids.some((id) => PRESCRIPTION_AUDIT_ROLE_IDS.includes(id))
|
|
||||||
})
|
|
||||||
|
|
||||||
/** 与后端 canAuditPaymentSlipOrder 同档：超管或 prescription_order_payment_audit_roles 默认 0,3 */
|
|
||||||
const canSetPayAuditOnAddLog = computed(() => {
|
|
||||||
const u = userStore.userInfo
|
|
||||||
if (!u || Number(u.root) === 1) return true
|
|
||||||
const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
|
|
||||||
return ids.some((id) => [0, 3].includes(id))
|
|
||||||
})
|
|
||||||
|
|
||||||
const addLogVisible = ref(false)
|
|
||||||
const addLogSaving = ref(false)
|
|
||||||
const addLogFormRef = ref<FormInstance>()
|
|
||||||
const addLogForm = reactive({
|
|
||||||
summary: '',
|
|
||||||
prescription_audit_status: '' as number | '',
|
|
||||||
payment_slip_audit_status: '' as number | '',
|
|
||||||
prescription_audit_remark: '',
|
|
||||||
payment_slip_audit_remark: ''
|
|
||||||
})
|
|
||||||
const addLogRules: FormRules = {
|
|
||||||
summary: [{ required: true, message: '请填写日志内容', trigger: 'blur' }]
|
|
||||||
}
|
|
||||||
|
|
||||||
const patchUsageVisible = ref(false)
|
|
||||||
const patchUsageSaving = ref(false)
|
|
||||||
const patchUsageFormRef = ref<FormInstance>()
|
|
||||||
const patchUsageForm = reactive({
|
|
||||||
times_per_day: 3 as number | undefined,
|
|
||||||
usage_days: 7 as number | undefined,
|
|
||||||
aux_times_per_day: 3 as number | undefined,
|
|
||||||
aux_usage_days: 7 as number | undefined,
|
|
||||||
medication_days: undefined as number | undefined
|
|
||||||
})
|
|
||||||
const patchUsageRules = computed<FormRules>(() => {
|
|
||||||
const rules: FormRules = {
|
|
||||||
times_per_day: [{ required: true, message: '请填写主方每天次数', trigger: 'change' }],
|
|
||||||
usage_days: [{ required: true, message: '请填写主方开立天数', trigger: 'change' }],
|
|
||||||
medication_days: [{ required: true, message: '请填写订单服用天数', trigger: 'change' }]
|
|
||||||
}
|
|
||||||
if (detailHasAuxHerbs.value) {
|
|
||||||
rules.aux_times_per_day = [{ required: true, message: '请填写辅方每天次数', trigger: 'change' }]
|
|
||||||
rules.aux_usage_days = [{ required: true, message: '请填写辅方开立天数', trigger: 'change' }]
|
|
||||||
}
|
|
||||||
return rules
|
|
||||||
})
|
|
||||||
|
|
||||||
function openPatchUsageDialog() {
|
|
||||||
const rx = detailPrescription.value
|
|
||||||
const ord = detailData.value
|
|
||||||
if (!rx || !ord?.id || !ord.prescription_id) {
|
|
||||||
feedback.msgWarning('无处方数据')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const aux = detailAuxUsage.value
|
|
||||||
patchUsageForm.times_per_day =
|
|
||||||
Number(rx.times_per_day) > 0 ? Number(rx.times_per_day) : 3
|
|
||||||
patchUsageForm.usage_days =
|
|
||||||
Number(rx.usage_days) > 0 ? Number(rx.usage_days) : 7
|
|
||||||
patchUsageForm.aux_times_per_day =
|
|
||||||
aux && Number(aux.times_per_day) > 0 ? Number(aux.times_per_day) : 3
|
|
||||||
patchUsageForm.aux_usage_days =
|
|
||||||
aux && Number(aux.usage_days) > 0 ? Number(aux.usage_days) : 7
|
|
||||||
const md = Number(ord.medication_days)
|
|
||||||
patchUsageForm.medication_days = md > 0 ? md : Number(rx.usage_days) > 0 ? Number(rx.usage_days) : 7
|
|
||||||
patchUsageVisible.value = true
|
|
||||||
nextTick(() => patchUsageFormRef.value?.clearValidate())
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetPatchUsageForm() {
|
|
||||||
patchUsageForm.times_per_day = 3
|
|
||||||
patchUsageForm.usage_days = 7
|
|
||||||
patchUsageForm.aux_times_per_day = 3
|
|
||||||
patchUsageForm.aux_usage_days = 7
|
|
||||||
patchUsageForm.medication_days = undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
async function submitPatchUsage() {
|
|
||||||
const form = patchUsageFormRef.value
|
|
||||||
if (!form) return
|
|
||||||
try {
|
|
||||||
await form.validate()
|
|
||||||
} catch {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const ordId = detailData.value?.id
|
|
||||||
if (!ordId) return
|
|
||||||
patchUsageSaving.value = true
|
|
||||||
try {
|
|
||||||
const payload: {
|
|
||||||
id: number
|
|
||||||
times_per_day: number
|
|
||||||
usage_days: number
|
|
||||||
medication_days: number
|
|
||||||
aux_times_per_day?: number
|
|
||||||
aux_usage_days?: number
|
|
||||||
} = {
|
|
||||||
id: ordId,
|
|
||||||
times_per_day: Number(patchUsageForm.times_per_day),
|
|
||||||
usage_days: Number(patchUsageForm.usage_days),
|
|
||||||
medication_days: Number(patchUsageForm.medication_days)
|
|
||||||
}
|
|
||||||
if (detailHasAuxHerbs.value) {
|
|
||||||
payload.aux_times_per_day = Number(patchUsageForm.aux_times_per_day)
|
|
||||||
payload.aux_usage_days = Number(patchUsageForm.aux_usage_days)
|
|
||||||
}
|
|
||||||
await prescriptionOrderPatchPrescriptionUsage(payload)
|
|
||||||
feedback.msgSuccess('保存成功')
|
|
||||||
patchUsageVisible.value = false
|
|
||||||
await refresh()
|
|
||||||
emit('detail-changed')
|
|
||||||
} catch {
|
|
||||||
/* 拦截器已提示 */
|
|
||||||
} finally {
|
|
||||||
patchUsageSaving.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetAddLogForm() {
|
|
||||||
addLogForm.summary = ''
|
|
||||||
addLogForm.prescription_audit_status = ''
|
|
||||||
addLogForm.payment_slip_audit_status = ''
|
|
||||||
addLogForm.prescription_audit_remark = ''
|
|
||||||
addLogForm.payment_slip_audit_remark = ''
|
|
||||||
addLogFormRef.value?.clearValidate()
|
|
||||||
}
|
|
||||||
|
|
||||||
function openAddLogDialog() {
|
|
||||||
if (!detailData.value?.id) return
|
|
||||||
resetAddLogForm()
|
|
||||||
const d = detailData.value
|
|
||||||
addLogForm.prescription_audit_remark = String(d.prescription_audit_remark || '')
|
|
||||||
addLogForm.payment_slip_audit_remark = String(d.payment_slip_audit_remark || '')
|
|
||||||
addLogVisible.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
async function submitAddLog() {
|
|
||||||
if (!addLogFormRef.value || !detailData.value?.id) return
|
|
||||||
await addLogFormRef.value.validate()
|
|
||||||
addLogSaving.value = true
|
|
||||||
try {
|
|
||||||
const payload: Record<string, unknown> = {
|
|
||||||
id: detailData.value.id,
|
|
||||||
summary: addLogForm.summary.trim()
|
|
||||||
}
|
|
||||||
if (
|
|
||||||
canSetRxAuditOnAddLog.value &&
|
|
||||||
addLogForm.prescription_audit_status !== '' &&
|
|
||||||
addLogForm.prescription_audit_status !== null &&
|
|
||||||
addLogForm.prescription_audit_status !== undefined
|
|
||||||
) {
|
|
||||||
payload.prescription_audit_status = addLogForm.prescription_audit_status
|
|
||||||
payload.prescription_audit_remark = addLogForm.prescription_audit_remark
|
|
||||||
}
|
|
||||||
if (
|
|
||||||
canSetPayAuditOnAddLog.value &&
|
|
||||||
addLogForm.payment_slip_audit_status !== '' &&
|
|
||||||
addLogForm.payment_slip_audit_status !== null &&
|
|
||||||
addLogForm.payment_slip_audit_status !== undefined
|
|
||||||
) {
|
|
||||||
payload.payment_slip_audit_status = addLogForm.payment_slip_audit_status
|
|
||||||
payload.payment_slip_audit_remark = addLogForm.payment_slip_audit_remark
|
|
||||||
}
|
|
||||||
await prescriptionOrderAddLog(payload as any)
|
|
||||||
feedback.msgSuccess('日志已添加')
|
|
||||||
addLogVisible.value = false
|
|
||||||
await refresh()
|
|
||||||
emit('detail-changed')
|
|
||||||
} catch {
|
|
||||||
/* 拦截器已提示 */
|
|
||||||
} finally {
|
|
||||||
addLogSaving.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ─── 未关联支付单 ───
|
// ─── 未关联支付单 ───
|
||||||
async function loadDetailUnlinkedPayOrders(diagnosisId: number, prescriptionOrderId: number, linkedIds: number[]) {
|
async function loadDetailUnlinkedPayOrders(diagnosisId: number, prescriptionOrderId: number, linkedIds: number[]) {
|
||||||
if (!diagnosisId) {
|
if (!diagnosisId) {
|
||||||
@@ -1643,8 +1266,6 @@ async function updateJdLogistics() {
|
|||||||
|
|
||||||
// ─── 打开 / 刷新 ───
|
// ─── 打开 / 刷新 ───
|
||||||
async function open(id: number) {
|
async function open(id: number) {
|
||||||
// 页面级同参数字典请求会取消抽屉挂载时的那次（axios 去重取消），打开时兜底重试
|
|
||||||
void loadServicePackageOptions()
|
|
||||||
// 显式彻底清空缓存，防止前一次弹窗的数据残留
|
// 显式彻底清空缓存，防止前一次弹窗的数据残留
|
||||||
detailData.value = null
|
detailData.value = null
|
||||||
detailUnlinkedPayOrders.value = []
|
detailUnlinkedPayOrders.value = []
|
||||||
|
|||||||
@@ -135,25 +135,13 @@ export function logActionText(act: string) {
|
|||||||
revoke_pay_audit: '撤回支付审核',
|
revoke_pay_audit: '撤回支付审核',
|
||||||
gancao_submit: '甘草下单',
|
gancao_submit: '甘草下单',
|
||||||
patch_rx_patient: '处方患者信息',
|
patch_rx_patient: '处方患者信息',
|
||||||
patch_rx_usage: '服用参数',
|
|
||||||
update_amount: '修改订单金额',
|
update_amount: '修改订单金额',
|
||||||
complete: '完成订单',
|
complete: '完成订单',
|
||||||
refund: '退款',
|
refund: '退款'
|
||||||
manual_log: '手工备注',
|
|
||||||
assign_assistant: '改派医助',
|
|
||||||
add_pay_order: '补齐支付单',
|
|
||||||
set_ship_mode: '发货类型'
|
|
||||||
}
|
}
|
||||||
return m[act] || act
|
return m[act] || act
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 处方/支付单审核状态文案（0 待审核 / 1 已通过 / 2 已驳回） */
|
|
||||||
export function auditStatusText(s: number | undefined) {
|
|
||||||
if (s === 1) return '已通过'
|
|
||||||
if (s === 2) return '已驳回'
|
|
||||||
return '待审核'
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 支付单来源/方式：企微对外收款、付呗、快递代收等创建链路 + 支付方式回退 */
|
/** 支付单来源/方式：企微对外收款、付呗、快递代收等创建链路 + 支付方式回退 */
|
||||||
export function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unknown }) {
|
export function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unknown }) {
|
||||||
const createType = String(row?.create_type || '')
|
const createType = String(row?.create_type || '')
|
||||||
@@ -369,85 +357,3 @@ export function formatDietaryTaboo(raw: unknown): string {
|
|||||||
}
|
}
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 服务套餐 dict：server_order */
|
|
||||||
export type ServicePackageOption = { name: string; value: string; status?: number }
|
|
||||||
|
|
||||||
export function normalizeServicePackageValue(v: unknown): string {
|
|
||||||
return String(v ?? '').trim()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 解析订单 service_package（逗号串 / 数组 / 单值数字） */
|
|
||||||
export function parseServicePackageValues(raw: unknown): string[] {
|
|
||||||
if (raw == null || raw === '') return []
|
|
||||||
if (Array.isArray(raw)) {
|
|
||||||
return raw.map(normalizeServicePackageValue).filter(Boolean)
|
|
||||||
}
|
|
||||||
if (typeof raw === 'string') {
|
|
||||||
return raw.split(',').map((v) => v.trim()).filter(Boolean)
|
|
||||||
}
|
|
||||||
const one = normalizeServicePackageValue(raw)
|
|
||||||
return one ? [one] : []
|
|
||||||
}
|
|
||||||
|
|
||||||
export function servicePackageValueEquals(a: unknown, b: unknown): boolean {
|
|
||||||
const sa = normalizeServicePackageValue(a)
|
|
||||||
const sb = normalizeServicePackageValue(b)
|
|
||||||
if (!sa || !sb) return false
|
|
||||||
if (sa === sb) return true
|
|
||||||
const na = Number(sa)
|
|
||||||
const nb = Number(sb)
|
|
||||||
return Number.isFinite(na) && Number.isFinite(nb) && na === nb
|
|
||||||
}
|
|
||||||
|
|
||||||
export function normalizeServicePackageOptions(raw: unknown): ServicePackageOption[] {
|
|
||||||
if (!Array.isArray(raw)) return []
|
|
||||||
return raw
|
|
||||||
.map((item: any) => ({
|
|
||||||
name: String(item?.name ?? '').trim() || normalizeServicePackageValue(item?.value),
|
|
||||||
value: normalizeServicePackageValue(item?.value),
|
|
||||||
status: Number(item?.status ?? 1)
|
|
||||||
}))
|
|
||||||
.filter((item) => item.value !== '')
|
|
||||||
}
|
|
||||||
|
|
||||||
export function findServicePackageOption(
|
|
||||||
options: ServicePackageOption[],
|
|
||||||
value: unknown
|
|
||||||
): ServicePackageOption | undefined {
|
|
||||||
const key = normalizeServicePackageValue(value)
|
|
||||||
if (!key) return undefined
|
|
||||||
return options.find((opt) => servicePackageValueEquals(opt.value, key))
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 展示用：value → 字典 name，多选用「、」连接 */
|
|
||||||
export function formatServicePackageLabels(
|
|
||||||
value: unknown,
|
|
||||||
options: ServicePackageOption[],
|
|
||||||
emptyText = '—'
|
|
||||||
): string {
|
|
||||||
const packages = parseServicePackageValues(value)
|
|
||||||
if (packages.length === 0) return emptyText
|
|
||||||
const names = packages.map((val) => {
|
|
||||||
const option = findServicePackageOption(options, val)
|
|
||||||
return option?.name || val
|
|
||||||
})
|
|
||||||
return names.join('、')
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 编辑下拉：字典项 + 当前已选但字典缺失的兜底项 */
|
|
||||||
export function mergeServicePackageSelectOptions(
|
|
||||||
options: ServicePackageOption[],
|
|
||||||
selected: unknown[]
|
|
||||||
): ServicePackageOption[] {
|
|
||||||
const known = new Set(options.map((o) => o.value))
|
|
||||||
const extras: ServicePackageOption[] = []
|
|
||||||
for (const raw of selected) {
|
|
||||||
const val = normalizeServicePackageValue(raw)
|
|
||||||
if (!val || known.has(val)) continue
|
|
||||||
const matched = findServicePackageOption(options, val)
|
|
||||||
extras.push(matched ?? { name: val, value: val, status: 0 })
|
|
||||||
known.add(val)
|
|
||||||
}
|
|
||||||
return extras.length ? [...options, ...extras] : options
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -298,7 +298,7 @@
|
|||||||
:fetch-fun="prescriptionOrderExport"
|
:fetch-fun="prescriptionOrderExport"
|
||||||
:params="prescriptionOrderExportParams"
|
:params="prescriptionOrderExportParams"
|
||||||
:page-size="pager.size"
|
:page-size="pager.size"
|
||||||
export-hint="导出范围与上方筛选一致（履约状态、创建时间及其他条件均会生效）。含「自媒体渠道（挂号渠道来源）」：优先取该单关联处方登记的挂号；无则诊单下同患者挂号取 id 最大的一条（与前台挂号选择的记录一致）；业绩侧栏带渠道筛选导出时与同页列表高亮挂号同源。「服务套餐」按字典 server_order 解析展示。「处方」导出主方/辅方药材明细；「主方/辅方服用方式、天数」与详情侧栏同口径（主方/辅方天数分别取处方 usage_days、辅方 aux_usage.usage_days；「天数」列为订单 medication_days）。「关联收款记录」与详情侧栏同源（已支付/已退款/待审核），每笔两行展示（摘要行+明细行），多笔空行分隔，单元格自动换行。「签收日期」与详情/业绩看板同源，仅读物流库（轨迹/签收时间）：导出不再实时查快递100，速度只取决于数据库；签收时间由 `tcm:backfill-sign-time` 命令与物流自动更新定时任务落库，刚发货尚未同步的单子会暂时为空，待下次回填/定时任务刷新后显示。"
|
export-hint="导出范围与上方筛选一致（履约状态、创建时间及其他条件均会生效）。含「自媒体渠道（挂号渠道来源）」：优先取该单关联处方登记的挂号；无则诊单下同患者挂号取 id 最大的一条（与前台挂号选择的记录一致）；业绩侧栏带渠道筛选导出时与同页列表高亮挂号同源。「服务套餐」按字典 server_order 解析展示。「关联收款记录」与详情侧栏同源（已支付/已退款/待审核），每笔两行展示（摘要行+明细行），多笔空行分隔，单元格自动换行。「签收日期」与详情/业绩看板同源，仅读物流库（轨迹/签收时间）：导出不再实时查快递100，速度只取决于数据库；签收时间由 `tcm:backfill-sign-time` 命令与物流自动更新定时任务落库，刚发货尚未同步的单子会暂时为空，待下次回填/定时任务刷新后显示。"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -623,7 +623,6 @@
|
|||||||
@view-prescription="detailData && openPrescriptionView(detailData)"
|
@view-prescription="detailData && openPrescriptionView(detailData)"
|
||||||
@test-gancao-preview="testGancaoPreviewFromDetail"
|
@test-gancao-preview="testGancaoPreviewFromDetail"
|
||||||
@view-patient="openDiagnosisPatientDetailFromOrder"
|
@view-patient="openDiagnosisPatientDetailFromOrder"
|
||||||
@detail-changed="getLists"
|
|
||||||
>
|
>
|
||||||
<template #header-extra="{ detail }">
|
<template #header-extra="{ detail }">
|
||||||
<div class="flex items-center gap-2 ml-4 shrink-0">
|
<div class="flex items-center gap-2 ml-4 shrink-0">
|
||||||
@@ -1025,11 +1024,10 @@
|
|||||||
class="w-full"
|
class="w-full"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in editServicePackageSelectOptions"
|
v-for="item in servicePackageOptions"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.value"
|
:value="item.value"
|
||||||
:disabled="item.status === 0"
|
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -2227,11 +2225,7 @@ import {
|
|||||||
canUpdateAmount,
|
canUpdateAmount,
|
||||||
formatDietaryTaboo,
|
formatDietaryTaboo,
|
||||||
type SlipFormulaType,
|
type SlipFormulaType,
|
||||||
type SlipAuxUsageForm,
|
type SlipAuxUsageForm
|
||||||
type ServicePackageOption,
|
|
||||||
normalizeServicePackageOptions,
|
|
||||||
parseServicePackageValues,
|
|
||||||
mergeServicePackageSelectOptions
|
|
||||||
} from './components/prescription-order-utils'
|
} from './components/prescription-order-utils'
|
||||||
import { useListTimeFilter } from '@/hooks/useListTimeFilter'
|
import { useListTimeFilter } from '@/hooks/useListTimeFilter'
|
||||||
import {
|
import {
|
||||||
@@ -2420,8 +2414,8 @@ async function submitReassign() {
|
|||||||
// 省市区数据
|
// 省市区数据
|
||||||
const regionOptions = ref([])
|
const regionOptions = ref([])
|
||||||
|
|
||||||
// 服务套餐选项（含已停用项，便于编辑时回显历史值）
|
// 服务套餐选项
|
||||||
const servicePackageOptions = ref<ServicePackageOption[]>([])
|
const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
|
||||||
|
|
||||||
/** 筛选：开方医生、诊单医助（与列表接口 doctor_id / assistant_id 一致） */
|
/** 筛选：开方医生、诊单医助（与列表接口 doctor_id / assistant_id 一致） */
|
||||||
const doctorOptions = ref<Array<{ id: number; name: string }>>([])
|
const doctorOptions = ref<Array<{ id: number; name: string }>>([])
|
||||||
@@ -2542,7 +2536,8 @@ const loadRegionData = async () => {
|
|||||||
const loadServicePackageOptions = async () => {
|
const loadServicePackageOptions = async () => {
|
||||||
try {
|
try {
|
||||||
const data = await getDictData({ type: 'server_order' })
|
const data = await getDictData({ type: 'server_order' })
|
||||||
servicePackageOptions.value = normalizeServicePackageOptions(data?.server_order)
|
servicePackageOptions.value = (data?.server_order || []).filter((item: any) => item.status !== 0)
|
||||||
|
console.log('服务套餐选项已加载:', servicePackageOptions.value.length)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('加载服务套餐选项失败:', error)
|
console.error('加载服务套餐选项失败:', error)
|
||||||
servicePackageOptions.value = []
|
servicePackageOptions.value = []
|
||||||
@@ -3200,17 +3195,10 @@ async function onDetailShipModeChange(mode: string | number | boolean | undefine
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function canAddPayOrderRow(row: {
|
function canAddPayOrderRow(row: { fulfillment_status?: number }) {
|
||||||
fulfillment_status?: number
|
// 已发货(5) / 已签收(6) 状态可补齐支付单
|
||||||
amount?: number | string
|
|
||||||
linked_pay_paid_total?: number | string
|
|
||||||
}) {
|
|
||||||
// 已发货(5) / 已签收(6) 状态可补齐支付单；总金额已付清则不允许
|
|
||||||
const fs = Number(row.fulfillment_status)
|
const fs = Number(row.fulfillment_status)
|
||||||
if (fs !== 5 && fs !== 6) return false
|
return fs === 5 || fs === 6
|
||||||
const orderAmount = Math.round((Number(row.amount) || 0) * 100) / 100
|
|
||||||
const paidTotal = Math.round((Number(row.linked_pay_paid_total) || 0) * 100) / 100
|
|
||||||
return paidTotal < orderAmount
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) {
|
function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) {
|
||||||
@@ -3461,11 +3449,6 @@ const editForm = reactive({
|
|||||||
diagnosis_creator_dept_path: ''
|
diagnosis_creator_dept_path: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 编辑弹窗下拉：字典项 + 当前已选但字典中缺失的兜底项 */
|
|
||||||
const editServicePackageSelectOptions = computed(() =>
|
|
||||||
mergeServicePackageSelectOptions(servicePackageOptions.value, editForm.service_package)
|
|
||||||
)
|
|
||||||
|
|
||||||
/** 诊单创建人部门：拆成面包屑。多部门为「；」分隔；路径内为「 / 」含父级（与后端 buildDeptPath 一致） */
|
/** 诊单创建人部门：拆成面包屑。多部门为「；」分隔；路径内为「 / 」含父级（与后端 buildDeptPath 一致） */
|
||||||
const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
|
const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
|
||||||
const raw = String(editForm.diagnosis_creator_dept_path || '').trim()
|
const raw = String(editForm.diagnosis_creator_dept_path || '').trim()
|
||||||
@@ -3698,7 +3681,18 @@ async function openEdit(row: {
|
|||||||
editForm.dose_unit = d.dose_unit || '剂'
|
editForm.dose_unit = d.dose_unit || '剂'
|
||||||
editForm.prev_staff = d.prev_staff || ''
|
editForm.prev_staff = d.prev_staff || ''
|
||||||
editForm.service_channel = d.service_channel || ''
|
editForm.service_channel = d.service_channel || ''
|
||||||
editForm.service_package = parseServicePackageValues(d.service_package)
|
// 处理服务套餐：如果是字符串，转换为数组
|
||||||
|
if (d.service_package) {
|
||||||
|
if (Array.isArray(d.service_package)) {
|
||||||
|
editForm.service_package = d.service_package
|
||||||
|
} else if (typeof d.service_package === 'string') {
|
||||||
|
editForm.service_package = d.service_package.split(',').filter(v => v.trim() !== '')
|
||||||
|
} else {
|
||||||
|
editForm.service_package = []
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
editForm.service_package = []
|
||||||
|
}
|
||||||
editForm.express_company = String(d.express_company || 'auto') || 'auto'
|
editForm.express_company = String(d.express_company || 'auto') || 'auto'
|
||||||
editForm.tracking_number = d.tracking_number || ''
|
editForm.tracking_number = d.tracking_number || ''
|
||||||
editForm.fee_type = Number(d.fee_type) || 3
|
editForm.fee_type = Number(d.fee_type) || 3
|
||||||
@@ -4515,18 +4509,7 @@ async function loadAddPayOrderAvailable(diagnosisId: number, currentLinkedIds: n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openAddPayOrder(row: {
|
function openAddPayOrder(row: { id: number; diagnosis_id?: number; pay_order_ids?: number[] }) {
|
||||||
id: number
|
|
||||||
diagnosis_id?: number
|
|
||||||
pay_order_ids?: number[]
|
|
||||||
fulfillment_status?: number
|
|
||||||
amount?: number | string
|
|
||||||
linked_pay_paid_total?: number | string
|
|
||||||
}) {
|
|
||||||
if (!canAddPayOrderRow(row)) {
|
|
||||||
feedback.msgWarning('订单总金额与已付金额一致，无需补齐支付单')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
addPayOrderRowId.value = row.id
|
addPayOrderRowId.value = row.id
|
||||||
addPayOrderForm.add_mode = 'create'
|
addPayOrderForm.add_mode = 'create'
|
||||||
addPayOrderForm.order_type = 3
|
addPayOrderForm.order_type = 3
|
||||||
|
|||||||
@@ -858,94 +858,31 @@
|
|||||||
</el-tag>
|
</el-tag>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="用量">
|
<el-descriptions-item label="用量">
|
||||||
<div class="flex flex-col gap-1 text-sm leading-relaxed">
|
<template v-if="detailPrescription.dosage_amount">
|
||||||
<div>
|
{{ detailPrescription.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
|
||||||
<span v-if="detailHasAuxHerbs" class="text-gray-500 mr-1">主方：</span>
|
<template v-if="detailPrescription.prescription_type === '浓缩水丸'">
|
||||||
<template v-if="detailPrescription.dosage_amount">
|
· {{ Number(detailPrescription.dosage_bag_count) > 0 ? Number(detailPrescription.dosage_bag_count) : 1 }}袋
|
||||||
{{ detailPrescription.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
|
</template>
|
||||||
<template v-if="detailPrescription.prescription_type === '浓缩水丸'">
|
<span v-if="detailPrescription.prescription_type === '饮片' && detailPrescription.need_decoction !== null" class="ml-2 text-gray-500">
|
||||||
· {{ Number(detailPrescription.dosage_bag_count) > 0 ? Number(detailPrescription.dosage_bag_count) : 1 }}袋
|
({{ detailPrescription.need_decoction ? '代煎' : '不代煎' }})
|
||||||
</template>
|
</span>
|
||||||
<span v-if="detailPrescription.prescription_type === '饮片' && detailPrescription.need_decoction !== null" class="ml-2 text-gray-500">
|
|
||||||
({{ detailPrescription.need_decoction ? '代煎' : '不代煎' }})
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
<template v-else>—</template>
|
|
||||||
</div>
|
|
||||||
<div v-if="detailHasAuxHerbs && detailAuxUsage">
|
|
||||||
<span class="text-gray-500 mr-1">辅方：</span>
|
|
||||||
<template v-if="detailAuxUsage.dosage_amount != null && detailAuxUsage.dosage_amount !== 0">
|
|
||||||
{{ detailAuxUsage.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
|
|
||||||
<template v-if="detailPrescription.prescription_type === '浓缩水丸'">
|
|
||||||
· {{ Number(detailAuxUsage.dosage_bag_count) > 0 ? Number(detailAuxUsage.dosage_bag_count) : 1 }}袋
|
|
||||||
</template>
|
|
||||||
<span v-if="detailPrescription.prescription_type === '饮片'" class="ml-2 text-gray-500">
|
|
||||||
({{ detailAuxUsage.need_decoction ? '代煎' : '不代煎' }})
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
<template v-else>—</template>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-descriptions-item>
|
|
||||||
<el-descriptions-item>
|
|
||||||
<template #label>
|
|
||||||
<div class="flex items-center gap-1 flex-wrap">
|
|
||||||
<span>服用方式</span>
|
|
||||||
<el-button
|
|
||||||
v-if="
|
|
||||||
detailData.prescription_id &&
|
|
||||||
detailPrescription &&
|
|
||||||
!String(detailData.prescription_detail_error || '').trim()
|
|
||||||
"
|
|
||||||
v-perms="['tcm.prescriptionOrder/patchPrescriptionUsage']"
|
|
||||||
type="primary"
|
|
||||||
size="small"
|
|
||||||
link
|
|
||||||
@click="openPatchUsageDialog"
|
|
||||||
>
|
|
||||||
修改
|
|
||||||
</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
<template v-else>—</template>
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="服用方式">
|
||||||
<div class="flex flex-col gap-1.5 text-sm leading-relaxed">
|
<div class="flex flex-col gap-1.5 text-sm leading-relaxed">
|
||||||
<template v-if="detailHasAuxHerbs">
|
<div>
|
||||||
<div>
|
<span class="text-gray-500">每天次数：</span>
|
||||||
<span class="text-gray-500 mr-1">主方：</span>
|
{{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '—' }}
|
||||||
每天
|
</div>
|
||||||
{{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '— 次' }}
|
<div>
|
||||||
· 处方开立
|
<span class="text-gray-500">处方开立：</span>
|
||||||
{{
|
{{
|
||||||
detailPrescription.usage_days != null && detailPrescription.usage_days !== ''
|
detailPrescription.usage_days != null && detailPrescription.usage_days !== ''
|
||||||
? detailPrescription.usage_days + ' 天'
|
? detailPrescription.usage_days + ' 天'
|
||||||
: '— 天'
|
: '—'
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="detailAuxUsage">
|
|
||||||
<span class="text-gray-500 mr-1">辅方：</span>
|
|
||||||
每天
|
|
||||||
{{ detailAuxUsage.times_per_day ? detailAuxUsage.times_per_day + ' 次' : '— 次' }}
|
|
||||||
· 处方开立
|
|
||||||
{{
|
|
||||||
detailAuxUsage.usage_days != null && Number(detailAuxUsage.usage_days) > 0
|
|
||||||
? detailAuxUsage.usage_days + ' 天'
|
|
||||||
: '— 天'
|
|
||||||
}}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<div>
|
|
||||||
<span class="text-gray-500">每天次数：</span>
|
|
||||||
{{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '—' }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span class="text-gray-500">处方开立：</span>
|
|
||||||
{{
|
|
||||||
detailPrescription.usage_days != null && detailPrescription.usage_days !== ''
|
|
||||||
? detailPrescription.usage_days + ' 天'
|
|
||||||
: '—'
|
|
||||||
}}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<div>
|
<div>
|
||||||
<span class="text-gray-500">订单设置：</span>
|
<span class="text-gray-500">订单设置：</span>
|
||||||
{{
|
{{
|
||||||
@@ -1202,7 +1139,7 @@
|
|||||||
<el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
|
<el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
|
||||||
|
|
||||||
<el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
|
<el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="服务套餐">{{ detailServicePackageText }}</el-descriptions-item>
|
<el-descriptions-item label="服务套餐">{{ formatServicePackage(detailData.service_package) }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
|
<el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
|
||||||
|
|
||||||
<el-descriptions-item v-if="detailData.internal_cost != null && detailData.internal_cost !== ''" label="内部成本">
|
<el-descriptions-item v-if="detailData.internal_cost != null && detailData.internal_cost !== ''" label="内部成本">
|
||||||
@@ -1588,11 +1525,10 @@
|
|||||||
class="w-full"
|
class="w-full"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in editServicePackageSelectOptions"
|
v-for="item in servicePackageOptions"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="item.value"
|
:value="item.value"
|
||||||
:disabled="item.status === 0"
|
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -2215,93 +2151,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 修改服用参数：主方 / 辅方 / 订单设置 -->
|
|
||||||
<el-dialog
|
|
||||||
v-model="patchUsageVisible"
|
|
||||||
title="修改服用参数"
|
|
||||||
width="92%"
|
|
||||||
:close-on-click-modal="false"
|
|
||||||
destroy-on-close
|
|
||||||
class="po-h5-dialog"
|
|
||||||
@closed="resetPatchUsageForm"
|
|
||||||
>
|
|
||||||
<el-form
|
|
||||||
ref="patchUsageFormRef"
|
|
||||||
:model="patchUsageForm"
|
|
||||||
:rules="patchUsageRules"
|
|
||||||
label-width="96px"
|
|
||||||
>
|
|
||||||
<div v-if="detailHasAuxHerbs" class="text-xs font-medium text-gray-500 mb-3">主方</div>
|
|
||||||
<el-form-item label="每天次数" prop="times_per_day">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.times_per_day"
|
|
||||||
:min="1"
|
|
||||||
:max="6"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="w-full"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="处方开立" prop="usage_days">
|
|
||||||
<div class="flex items-center gap-1 w-full">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.usage_days"
|
|
||||||
:min="1"
|
|
||||||
:max="999"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
<span class="text-gray-500 shrink-0">天</span>
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
<template v-if="detailHasAuxHerbs">
|
|
||||||
<div class="text-xs font-medium text-gray-500 mb-3 mt-2 pt-2 border-t border-gray-100">辅方</div>
|
|
||||||
<el-form-item label="每天次数" prop="aux_times_per_day">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.aux_times_per_day"
|
|
||||||
:min="1"
|
|
||||||
:max="6"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="w-full"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="处方开立" prop="aux_usage_days">
|
|
||||||
<div class="flex items-center gap-1 w-full">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.aux_usage_days"
|
|
||||||
:min="1"
|
|
||||||
:max="999"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
<span class="text-gray-500 shrink-0">天</span>
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
</template>
|
|
||||||
<div class="text-xs font-medium text-gray-500 mb-3 mt-2 pt-2 border-t border-gray-100">订单设置</div>
|
|
||||||
<el-form-item label="服用天数" prop="medication_days">
|
|
||||||
<div class="flex items-center gap-1 w-full">
|
|
||||||
<el-input-number
|
|
||||||
v-model="patchUsageForm.medication_days"
|
|
||||||
:min="1"
|
|
||||||
:max="999"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="flex-1 min-w-0"
|
|
||||||
/>
|
|
||||||
<span class="text-gray-500 shrink-0">天</span>
|
|
||||||
</div>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="patchUsageVisible = false">取消</el-button>
|
|
||||||
<el-button type="primary" :loading="patchUsageSaving" @click="submitPatchUsage">保存</el-button>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
|
|
||||||
<!-- 处方详情查看（处方单样式） -->
|
<!-- 处方详情查看（处方单样式） -->
|
||||||
<el-drawer
|
<el-drawer
|
||||||
v-model="prescriptionViewVisible"
|
v-model="prescriptionViewVisible"
|
||||||
@@ -2716,7 +2565,6 @@ import {
|
|||||||
prescriptionOrderRevokeRxAudit,
|
prescriptionOrderRevokeRxAudit,
|
||||||
prescriptionOrderRevokePayAudit,
|
prescriptionOrderRevokePayAudit,
|
||||||
prescriptionOrderPatchPrescriptionPatient,
|
prescriptionOrderPatchPrescriptionPatient,
|
||||||
prescriptionOrderPatchPrescriptionUsage,
|
|
||||||
prescriptionOrderLinkPayOrder,
|
prescriptionOrderLinkPayOrder,
|
||||||
prescriptionOrderRequestCompletion,
|
prescriptionOrderRequestCompletion,
|
||||||
prescriptionOrderSubmitGancaoRecipel,
|
prescriptionOrderSubmitGancaoRecipel,
|
||||||
@@ -2725,16 +2573,7 @@ import {
|
|||||||
getDoctors,
|
getDoctors,
|
||||||
getAssistants
|
getAssistants
|
||||||
} from '@/api/tcm'
|
} from '@/api/tcm'
|
||||||
import {
|
import { formatDietaryTaboo } from './components/prescription-order-utils'
|
||||||
formatDietaryTaboo,
|
|
||||||
type ServicePackageOption,
|
|
||||||
normalizeServicePackageOptions,
|
|
||||||
parseServicePackageValues,
|
|
||||||
mergeServicePackageSelectOptions,
|
|
||||||
formatServicePackageLabels,
|
|
||||||
normalizeSlipAuxUsageForm,
|
|
||||||
prescriptionHasAuxFormula
|
|
||||||
} from './components/prescription-order-utils'
|
|
||||||
import html2canvas from 'html2canvas'
|
import html2canvas from 'html2canvas'
|
||||||
import { jsPDF } from 'jspdf'
|
import { jsPDF } from 'jspdf'
|
||||||
import { getDictData } from '@/api/app'
|
import { getDictData } from '@/api/app'
|
||||||
@@ -2830,7 +2669,7 @@ const canViewFinanceFields = () => {
|
|||||||
const regionOptions = ref([])
|
const regionOptions = ref([])
|
||||||
|
|
||||||
// 服务套餐选项
|
// 服务套餐选项
|
||||||
const servicePackageOptions = ref<ServicePackageOption[]>([])
|
const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
|
||||||
|
|
||||||
/** 筛选：开方医生、诊单医助（与列表接口 doctor_id / assistant_id 一致） */
|
/** 筛选：开方医生、诊单医助（与列表接口 doctor_id / assistant_id 一致） */
|
||||||
const doctorOptions = ref<Array<{ id: number; name: string }>>([])
|
const doctorOptions = ref<Array<{ id: number; name: string }>>([])
|
||||||
@@ -2951,7 +2790,8 @@ const loadRegionData = async () => {
|
|||||||
const loadServicePackageOptions = async () => {
|
const loadServicePackageOptions = async () => {
|
||||||
try {
|
try {
|
||||||
const data = await getDictData({ type: 'server_order' })
|
const data = await getDictData({ type: 'server_order' })
|
||||||
servicePackageOptions.value = normalizeServicePackageOptions(data?.server_order)
|
servicePackageOptions.value = (data?.server_order || []).filter((item: any) => item.status !== 0)
|
||||||
|
console.log('服务套餐选项已加载:', servicePackageOptions.value.length)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('加载服务套餐选项失败:', error)
|
console.error('加载服务套餐选项失败:', error)
|
||||||
servicePackageOptions.value = []
|
servicePackageOptions.value = []
|
||||||
@@ -3359,6 +3199,28 @@ function feeTypeText(t: number | undefined) {
|
|||||||
return m[Number(t)] ?? '—'
|
return m[Number(t)] ?? '—'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 格式化服务套餐显示
|
||||||
|
function formatServicePackage(value: any): string {
|
||||||
|
if (!value) return '—'
|
||||||
|
|
||||||
|
let packages: string[] = []
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
packages = value
|
||||||
|
} else if (typeof value === 'string') {
|
||||||
|
packages = value.split(',').filter(v => v.trim() !== '')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (packages.length === 0) return '—'
|
||||||
|
|
||||||
|
// 将值转换为名称
|
||||||
|
const names = packages.map(val => {
|
||||||
|
const option = servicePackageOptions.value.find(opt => opt.value === val)
|
||||||
|
return option ? option.name : val
|
||||||
|
})
|
||||||
|
|
||||||
|
return names.join('、')
|
||||||
|
}
|
||||||
|
|
||||||
function auditStatusText(s: number | undefined) {
|
function auditStatusText(s: number | undefined) {
|
||||||
if (s === 1) return '已通过'
|
if (s === 1) return '已通过'
|
||||||
if (s === 2) return '已驳回'
|
if (s === 2) return '已驳回'
|
||||||
@@ -3611,10 +3473,6 @@ const detailVisible = ref(false)
|
|||||||
const detailLoading = ref(false)
|
const detailLoading = ref(false)
|
||||||
const detailData = ref<Record<string, any> | null>(null)
|
const detailData = ref<Record<string, any> | null>(null)
|
||||||
|
|
||||||
const detailServicePackageText = computed(() =>
|
|
||||||
formatServicePackageLabels(detailData.value?.service_package, servicePackageOptions.value)
|
|
||||||
)
|
|
||||||
|
|
||||||
// --- 订单可视化审批履约流程逻辑 ---
|
// --- 订单可视化审批履约流程逻辑 ---
|
||||||
const workflowActiveStep = computed(() => {
|
const workflowActiveStep = computed(() => {
|
||||||
if (!detailData.value) return 0
|
if (!detailData.value) return 0
|
||||||
@@ -3771,16 +3629,6 @@ const detailLinkedAppointmentResolvedFromTag = computed(() => {
|
|||||||
|
|
||||||
const detailRxHerbs = computed(() => normalizeSlipHerbs(detailPrescription.value?.herbs))
|
const detailRxHerbs = computed(() => normalizeSlipHerbs(detailPrescription.value?.herbs))
|
||||||
|
|
||||||
const detailHasAuxHerbs = computed(() => prescriptionHasAuxFormula(detailPrescription.value as any))
|
|
||||||
|
|
||||||
const detailAuxUsage = computed(() => {
|
|
||||||
const rx = detailPrescription.value as any
|
|
||||||
if (!rx || !prescriptionHasAuxFormula(rx)) return null
|
|
||||||
const raw = rx.aux_usage
|
|
||||||
if (raw == null || raw === '' || (Array.isArray(raw) && raw.length === 0)) return null
|
|
||||||
return normalizeSlipAuxUsageForm(raw, rx.prescription_type || '浓缩水丸')
|
|
||||||
})
|
|
||||||
|
|
||||||
/** false=无权限；true/缺省兼容旧接口（旧版未下发该字段时仍展示药材） */
|
/** false=无权限；true/缺省兼容旧接口（旧版未下发该字段时仍展示药材） */
|
||||||
const detailHerbsVisible = computed(() => detailData.value?.prescription_detail_herbs_visible !== false)
|
const detailHerbsVisible = computed(() => detailData.value?.prescription_detail_herbs_visible !== false)
|
||||||
|
|
||||||
@@ -4007,101 +3855,6 @@ const patchRxPatientRules: FormRules = {
|
|||||||
phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
|
phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
|
||||||
}
|
}
|
||||||
|
|
||||||
const patchUsageVisible = ref(false)
|
|
||||||
const patchUsageSaving = ref(false)
|
|
||||||
const patchUsageFormRef = ref<FormInstance>()
|
|
||||||
const patchUsageForm = reactive({
|
|
||||||
times_per_day: 3 as number | undefined,
|
|
||||||
usage_days: 7 as number | undefined,
|
|
||||||
aux_times_per_day: 3 as number | undefined,
|
|
||||||
aux_usage_days: 7 as number | undefined,
|
|
||||||
medication_days: undefined as number | undefined
|
|
||||||
})
|
|
||||||
const patchUsageRules = computed<FormRules>(() => {
|
|
||||||
const rules: FormRules = {
|
|
||||||
times_per_day: [{ required: true, message: '请填写主方每天次数', trigger: 'change' }],
|
|
||||||
usage_days: [{ required: true, message: '请填写主方开立天数', trigger: 'change' }],
|
|
||||||
medication_days: [{ required: true, message: '请填写订单服用天数', trigger: 'change' }]
|
|
||||||
}
|
|
||||||
if (detailHasAuxHerbs.value) {
|
|
||||||
rules.aux_times_per_day = [{ required: true, message: '请填写辅方每天次数', trigger: 'change' }]
|
|
||||||
rules.aux_usage_days = [{ required: true, message: '请填写辅方开立天数', trigger: 'change' }]
|
|
||||||
}
|
|
||||||
return rules
|
|
||||||
})
|
|
||||||
|
|
||||||
function openPatchUsageDialog() {
|
|
||||||
const rx = detailPrescription.value
|
|
||||||
const ord = detailData.value
|
|
||||||
if (!rx || !ord?.id || !ord.prescription_id) {
|
|
||||||
feedback.msgWarning('无处方数据')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const aux = detailAuxUsage.value
|
|
||||||
patchUsageForm.times_per_day =
|
|
||||||
Number(rx.times_per_day) > 0 ? Number(rx.times_per_day) : 3
|
|
||||||
patchUsageForm.usage_days =
|
|
||||||
Number(rx.usage_days) > 0 ? Number(rx.usage_days) : 7
|
|
||||||
patchUsageForm.aux_times_per_day =
|
|
||||||
aux && Number(aux.times_per_day) > 0 ? Number(aux.times_per_day) : 3
|
|
||||||
patchUsageForm.aux_usage_days =
|
|
||||||
aux && Number(aux.usage_days) > 0 ? Number(aux.usage_days) : 7
|
|
||||||
const md = Number(ord.medication_days)
|
|
||||||
patchUsageForm.medication_days = md > 0 ? md : Number(rx.usage_days) > 0 ? Number(rx.usage_days) : 7
|
|
||||||
patchUsageVisible.value = true
|
|
||||||
nextTick(() => patchUsageFormRef.value?.clearValidate())
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetPatchUsageForm() {
|
|
||||||
patchUsageForm.times_per_day = 3
|
|
||||||
patchUsageForm.usage_days = 7
|
|
||||||
patchUsageForm.aux_times_per_day = 3
|
|
||||||
patchUsageForm.aux_usage_days = 7
|
|
||||||
patchUsageForm.medication_days = undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
async function submitPatchUsage() {
|
|
||||||
const form = patchUsageFormRef.value
|
|
||||||
if (!form) return
|
|
||||||
try {
|
|
||||||
await form.validate()
|
|
||||||
} catch {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const ordId = detailData.value?.id
|
|
||||||
if (!ordId) return
|
|
||||||
patchUsageSaving.value = true
|
|
||||||
try {
|
|
||||||
const payload: {
|
|
||||||
id: number
|
|
||||||
times_per_day: number
|
|
||||||
usage_days: number
|
|
||||||
medication_days: number
|
|
||||||
aux_times_per_day?: number
|
|
||||||
aux_usage_days?: number
|
|
||||||
} = {
|
|
||||||
id: ordId,
|
|
||||||
times_per_day: Number(patchUsageForm.times_per_day),
|
|
||||||
usage_days: Number(patchUsageForm.usage_days),
|
|
||||||
medication_days: Number(patchUsageForm.medication_days)
|
|
||||||
}
|
|
||||||
if (detailHasAuxHerbs.value) {
|
|
||||||
payload.aux_times_per_day = Number(patchUsageForm.aux_times_per_day)
|
|
||||||
payload.aux_usage_days = Number(patchUsageForm.aux_usage_days)
|
|
||||||
}
|
|
||||||
await prescriptionOrderPatchPrescriptionUsage(payload)
|
|
||||||
feedback.msgSuccess('保存成功')
|
|
||||||
patchUsageVisible.value = false
|
|
||||||
await refreshCurrentPrescriptionOrderDetail()
|
|
||||||
await fetchLogs(ordId)
|
|
||||||
getLists()
|
|
||||||
} catch {
|
|
||||||
/* 拦截器已提示 */
|
|
||||||
} finally {
|
|
||||||
patchUsageSaving.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function openPatchRxPatientDialog() {
|
function openPatchRxPatientDialog() {
|
||||||
const rx = detailPrescription.value
|
const rx = detailPrescription.value
|
||||||
const ord = detailData.value
|
const ord = detailData.value
|
||||||
@@ -4307,10 +4060,6 @@ const editForm = reactive({
|
|||||||
diagnosis_creator_dept_path: ''
|
diagnosis_creator_dept_path: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
const editServicePackageSelectOptions = computed(() =>
|
|
||||||
mergeServicePackageSelectOptions(servicePackageOptions.value, editForm.service_package)
|
|
||||||
)
|
|
||||||
|
|
||||||
/** 诊单创建人部门：拆成面包屑。多部门为「；」分隔；路径内为「 / 」含父级（与后端 buildDeptPath 一致） */
|
/** 诊单创建人部门：拆成面包屑。多部门为「；」分隔；路径内为「 / 」含父级（与后端 buildDeptPath 一致） */
|
||||||
const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
|
const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
|
||||||
const raw = String(editForm.diagnosis_creator_dept_path || '').trim()
|
const raw = String(editForm.diagnosis_creator_dept_path || '').trim()
|
||||||
@@ -4561,7 +4310,18 @@ async function openEdit(row: {
|
|||||||
editForm.dose_unit = d.dose_unit || '剂'
|
editForm.dose_unit = d.dose_unit || '剂'
|
||||||
editForm.prev_staff = d.prev_staff || ''
|
editForm.prev_staff = d.prev_staff || ''
|
||||||
editForm.service_channel = d.service_channel || ''
|
editForm.service_channel = d.service_channel || ''
|
||||||
editForm.service_package = parseServicePackageValues(d.service_package)
|
// 处理服务套餐：如果是字符串，转换为数组
|
||||||
|
if (d.service_package) {
|
||||||
|
if (Array.isArray(d.service_package)) {
|
||||||
|
editForm.service_package = d.service_package
|
||||||
|
} else if (typeof d.service_package === 'string') {
|
||||||
|
editForm.service_package = d.service_package.split(',').filter(v => v.trim() !== '')
|
||||||
|
} else {
|
||||||
|
editForm.service_package = []
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
editForm.service_package = []
|
||||||
|
}
|
||||||
editForm.express_company = String(d.express_company || 'auto') || 'auto'
|
editForm.express_company = String(d.express_company || 'auto') || 'auto'
|
||||||
editForm.tracking_number = d.tracking_number || ''
|
editForm.tracking_number = d.tracking_number || ''
|
||||||
editForm.fee_type = Number(d.fee_type) || 3
|
editForm.fee_type = Number(d.fee_type) || 3
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="code-generation">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form class="mb-[-16px]" :model="formData" inline>
|
<el-form class="mb-[-16px]" :model="formData" inline>
|
||||||
<el-form-item class="w-[280px]" label="表名称">
|
<el-form-item class="w-[280px]" label="表名称">
|
||||||
<el-input v-model="formData.table_name" clearable @keyup.enter="resetPage" />
|
<el-input v-model="formData.table_name" clearable @keyup.enter="resetPage" />
|
||||||
@@ -13,8 +13,8 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never" v-loading="pager.loading">
|
<admin-page-data-panel>
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
<data-table
|
<data-table
|
||||||
v-perms="['tools.generator/selectTable']"
|
v-perms="['tools.generator/selectTable']"
|
||||||
@@ -126,10 +126,10 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<code-preview
|
<code-preview
|
||||||
v-if="previewState.show"
|
v-if="previewState.show"
|
||||||
v-model="previewState.show"
|
v-model="previewState.show"
|
||||||
|
|||||||
@@ -866,7 +866,7 @@ onUnmounted(() => {
|
|||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: linear-gradient(145deg, #6366f1 0%, #8b5cf6 100%);
|
background: linear-gradient(145deg, #0d9488 0%, #0891b2 100%);
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="error">
|
<div class="error">
|
||||||
<div>
|
<div class="error-panel">
|
||||||
<slot name="content">
|
<slot name="content">
|
||||||
<div class="error-code">{{ code }}</div>
|
<div class="error-code">{{ code }}</div>
|
||||||
</slot>
|
</slot>
|
||||||
<div class="text-lg text-tx-secondary mt-7 mb-7">{{ title }}</div>
|
<div class="error-title">{{ title }}</div>
|
||||||
<el-button v-if="showBtn" type="primary" @click="router.go(-1)">
|
<el-button v-if="showBtn" type="primary" size="large" @click="router.go(-1)">
|
||||||
{{ second }} 秒后返回上一页
|
{{ second }} 秒后返回上一页
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -43,16 +43,38 @@ onUnmounted(() => {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.error {
|
.error {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
height: 100vh;
|
min-height: 100vh;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
.error-code {
|
background: var(--el-bg-color-page);
|
||||||
@apply text-primary;
|
padding: 24px;
|
||||||
font-size: 150px;
|
}
|
||||||
}
|
|
||||||
.el-button {
|
.error-panel {
|
||||||
width: 176px;
|
width: min(480px, 100%);
|
||||||
}
|
padding: 48px 32px;
|
||||||
|
border-radius: var(--admin-radius-xl);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
background: var(--el-bg-color);
|
||||||
|
box-shadow: var(--el-box-shadow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-code {
|
||||||
|
@apply text-primary;
|
||||||
|
font-size: 96px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: -0.04em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-title {
|
||||||
|
@apply text-tx-secondary;
|
||||||
|
font-size: 18px;
|
||||||
|
margin: 20px 0 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-button {
|
||||||
|
min-width: 176px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="fans-management">
|
<div class="fans-management">
|
||||||
<!-- 搜索区域 -->
|
<!-- 搜索区域 -->
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form class="ls-form" :model="formData" inline>
|
<el-form class="ls-form" :model="formData" inline>
|
||||||
<el-form-item class="w-[280px]" label="姓名">
|
<el-form-item class="w-[280px]" label="姓名">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -36,14 +36,14 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
|
|
||||||
<!-- 列表区域 -->
|
<!-- 列表区域 -->
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<div class="mb-4">
|
<template #toolbar>
|
||||||
<el-button type="primary" @click="handleAdd">新增粉丝</el-button>
|
<el-button type="primary" @click="handleAdd">新增粉丝</el-button>
|
||||||
</div>
|
</template>
|
||||||
<el-table :data="pager.lists" size="large" v-loading="pager.loading">
|
<el-table :data="pager.lists" size="large">
|
||||||
<el-table-column label="ID" prop="id" width="70" />
|
<el-table-column label="ID" prop="id" width="70" />
|
||||||
<el-table-column label="姓名" prop="name" min-width="100" />
|
<el-table-column label="姓名" prop="name" min-width="100" />
|
||||||
<el-table-column label="手机号" prop="phone" min-width="130" />
|
<el-table-column label="手机号" prop="phone" min-width="130" />
|
||||||
@@ -81,10 +81,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex mt-4 justify-end">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
|
|
||||||
<!-- 新增/编辑粉丝弹窗 -->
|
<!-- 新增/编辑粉丝弹窗 -->
|
||||||
<el-dialog
|
<el-dialog
|
||||||
|
|||||||
@@ -3704,7 +3704,7 @@ function getYejiDeptComboOption(tb: YejiTable) {
|
|||||||
const cats = rows.map(r =>
|
const cats = rows.map(r =>
|
||||||
r.dept_name.length > 10 ? `${r.dept_name.slice(0, 10)}…` : r.dept_name
|
r.dept_name.length > 10 ? `${r.dept_name.slice(0, 10)}…` : r.dept_name
|
||||||
)
|
)
|
||||||
const palette = ['#64748b', '#38bdf8', '#6366f1']
|
const palette = ['#64748b', '#38bdf8', '#0d9488']
|
||||||
const series: any[] = [
|
const series: any[] = [
|
||||||
{
|
{
|
||||||
name: '进线',
|
name: '进线',
|
||||||
@@ -4029,8 +4029,8 @@ onMounted(async () => {
|
|||||||
|
|
||||||
.yeji-page {
|
.yeji-page {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
--yj-brand: #6366f1;
|
--yj-brand: #0d9488;
|
||||||
--yj-brand-soft: #eef2ff;
|
--yj-brand-soft: #f0fdfa;
|
||||||
--yj-teal: #0ea5e9;
|
--yj-teal: #0ea5e9;
|
||||||
--yj-teal-soft: #f0f9ff;
|
--yj-teal-soft: #f0f9ff;
|
||||||
--yj-accent: #f43f5e;
|
--yj-accent: #f43f5e;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="warning"
|
type="warning"
|
||||||
title="温馨提示：用户账户变动记录"
|
title="温馨提示：用户账户变动记录"
|
||||||
@@ -38,9 +38,9 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
|
<el-table size="large" :data="pager.lists">
|
||||||
<el-table-column label="用户账号" prop="account" min-width="100" />
|
<el-table-column label="用户账号" prop="account" min-width="100" />
|
||||||
<el-table-column label="用户昵称" min-width="160">
|
<el-table-column label="用户昵称" min-width="160">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
@@ -71,10 +71,10 @@
|
|||||||
<el-table-column label="来源单号" prop="source_sn" min-width="100" />
|
<el-table-column label="来源单号" prop="source_sn" min-width="100" />
|
||||||
<el-table-column label="记录时间" prop="create_time" min-width="120" />
|
<el-table-column label="记录时间" prop="create_time" min-width="120" />
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup name="balanceDetail">
|
<script lang="ts" setup name="balanceDetail">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="warning"
|
type="warning"
|
||||||
title="温馨提示：用户充值记录"
|
title="温馨提示：用户充值记录"
|
||||||
@@ -54,9 +54,9 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
|
<el-table size="large" :data="pager.lists">
|
||||||
<el-table-column label="用户信息" min-width="160">
|
<el-table-column label="用户信息" min-width="160">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
@@ -104,10 +104,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup name="rechargeRecord">
|
<script lang="ts" setup name="rechargeRecord">
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form ref="formRef" class="mb-[-16px] mt-[16px]" :model="queryParams" :inline="true">
|
<el-form ref="formRef" class="mb-[-16px] mt-[16px]" :model="queryParams" :inline="true">
|
||||||
<el-form-item class="w-[280px]" label="退款单号">
|
<el-form-item class="w-[280px]" label="退款单号">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -69,8 +69,8 @@
|
|||||||
/> -->
|
/> -->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel>
|
||||||
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
|
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
|
||||||
<el-tab-pane
|
<el-tab-pane
|
||||||
v-for="(item, index) in tabLists"
|
v-for="(item, index) in tabLists"
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
:name="index"
|
:name="index"
|
||||||
:key="index"
|
:key="index"
|
||||||
>
|
>
|
||||||
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
|
<el-table size="large" :data="pager.lists">
|
||||||
<el-table-column label="退款单号" prop="sn" min-width="190" />
|
<el-table-column label="退款单号" prop="sn" min-width="190" />
|
||||||
<el-table-column label="用户信息" min-width="160">
|
<el-table-column label="用户信息" min-width="160">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
@@ -140,10 +140,10 @@
|
|||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
|
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<refund-log v-model="showRefundLog" :refund-id="selectRefundId" />
|
<refund-log v-model="showRefundLog" :refund-id="selectRefundId" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-alert
|
<el-alert
|
||||||
type="warning"
|
type="warning"
|
||||||
title="温馨提示：平台配置在各个场景下的通知发送方式和内容模板"
|
title="温馨提示：平台配置在各个场景下的通知发送方式和内容模板"
|
||||||
:closable="false"
|
:closable="false"
|
||||||
show-icon
|
show-icon
|
||||||
></el-alert>
|
></el-alert>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<el-tabs v-model="tabsActive" @tab-change="getLists">
|
<el-tabs v-model="tabsActive" @tab-change="getLists">
|
||||||
<el-tab-pane
|
<el-tab-pane
|
||||||
v-for="(item, index) in tabsMap"
|
v-for="(item, index) in tabsMap"
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
lazy
|
lazy
|
||||||
></el-tab-pane>
|
></el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<el-table size="large" :data="pager.lists" v-loading="pager.loading">
|
<el-table size="large" :data="pager.lists" >
|
||||||
<el-table-column label="通知场景" prop="scene_name" min-width="120" />
|
<el-table-column label="通知场景" prop="scene_name" min-width="120" />
|
||||||
<el-table-column label="通知类型" prop="type_desc" min-width="160" />
|
<el-table-column label="通知类型" prop="type_desc" min-width="160" />
|
||||||
<el-table-column label="短信通知" min-width="80">
|
<el-table-column label="短信通知" min-width="80">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts" setup name="notice">
|
<script lang="ts" setup name="notice">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card class="!border-none" shadow="never" v-loading="state.loading">
|
<admin-page-data-panel v-loading="state.loading">
|
||||||
<el-table size="large" :data="state.lists">
|
<el-table size="large" :data="state.lists">
|
||||||
<el-table-column label="短信渠道" prop="name" min-width="120" />
|
<el-table-column label="短信渠道" prop="name" min-width="120" />
|
||||||
<el-table-column label="状态" min-width="120">
|
<el-table-column label="状态" min-width="120">
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<edit-popup ref="editRef" @success="getLists" />
|
<edit-popup ref="editRef" @success="getLists" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -33,13 +33,11 @@ import EditPopup from './edit.vue'
|
|||||||
|
|
||||||
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
|
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
|
||||||
|
|
||||||
// 列表数据
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
loading: false,
|
loading: false,
|
||||||
lists: []
|
lists: []
|
||||||
})
|
})
|
||||||
|
|
||||||
// 获取存储引擎列表数据
|
|
||||||
const getLists = async () => {
|
const getLists = async () => {
|
||||||
try {
|
try {
|
||||||
state.loading = true
|
state.loading = true
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<!-- 订单列表 -->
|
<!-- 订单列表 -->
|
||||||
<template>
|
<template>
|
||||||
<div class="order-list">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<!-- 搜索表单 -->
|
<!-- 搜索表单 -->
|
||||||
<el-form class="ls-form" :model="queryParams" inline>
|
<el-form class="ls-form" :model="queryParams" inline>
|
||||||
<el-form-item class="w-[280px]" label="订单号">
|
<el-form-item class="w-[280px]" label="订单号">
|
||||||
@@ -106,10 +106,10 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
|
|
||||||
<!-- Tab 筛选 + 今日收益 -->
|
<!-- Tab 筛选 + 今日收益 + 数据表格 -->
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<div class="flex items-center justify-between mb-4">
|
<div class="flex items-center justify-between mb-4">
|
||||||
<el-tabs v-model="patientAssociationTab" @tab-change="handleTabChange">
|
<el-tabs v-model="patientAssociationTab" @tab-change="handleTabChange">
|
||||||
<el-tab-pane label="全部" name="" />
|
<el-tab-pane label="全部" name="" />
|
||||||
@@ -122,10 +122,7 @@
|
|||||||
<span class="text-gray-400">（{{ todayRevenue.count }} 笔）</span>
|
<span class="text-gray-400">（{{ todayRevenue.count }} 笔）</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
|
||||||
|
|
||||||
<!-- 数据表格 -->
|
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
<div v-perms="['order.order/zhipai']" class="mb-3 flex items-center gap-3">
|
<div v-perms="['order.order/zhipai']" class="mb-3 flex items-center gap-3">
|
||||||
<el-button type="primary" :disabled="!selectedOrderIds.length" @click="openAssignDialog">
|
<el-button type="primary" :disabled="!selectedOrderIds.length" @click="openAssignDialog">
|
||||||
将创建人指给医助
|
将创建人指给医助
|
||||||
@@ -136,7 +133,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
ref="orderTableRef"
|
ref="orderTableRef"
|
||||||
v-loading="pager.loading"
|
|
||||||
:data="pager.lists"
|
:data="pager.lists"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
size="large"
|
size="large"
|
||||||
@@ -283,10 +279,10 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
|
|
||||||
<!-- 详情弹窗 -->
|
<!-- 详情弹窗 -->
|
||||||
<el-dialog
|
<el-dialog
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="department">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||||
<el-form-item class="w-[280px]" label="部门名称" prop="name">
|
<el-form-item class="w-[280px]" label="部门名称" prop="name">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -22,22 +22,21 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
<div>
|
<admin-page-data-panel v-loading="loading">
|
||||||
|
<template #toolbar>
|
||||||
<el-button v-perms="['dept.dept/add']" type="primary" @click="handleAdd()">
|
<el-button v-perms="['dept.dept/add']" type="primary" @click="handleAdd()">
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<icon name="el-icon-Plus" />
|
<icon name="el-icon-Plus" />
|
||||||
</template>
|
</template>
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button @click="handleExpand"> 展开/折叠 </el-button>
|
<el-button @click="handleExpand">展开/折叠</el-button>
|
||||||
</div>
|
</template>
|
||||||
<el-table
|
<el-table
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
class="mt-4"
|
|
||||||
size="large"
|
size="large"
|
||||||
v-loading="loading"
|
|
||||||
:data="lists"
|
:data="lists"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||||
@@ -68,7 +67,6 @@
|
|||||||
}}</el-tag>
|
}}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column label="排序" prop="sort" min-width="100" />
|
<el-table-column label="排序" prop="sort" min-width="100" />
|
||||||
<el-table-column label="更新时间" prop="update_time" min-width="180" />
|
<el-table-column label="更新时间" prop="update_time" min-width="180" />
|
||||||
<el-table-column label="操作" width="160" fixed="right">
|
<el-table-column label="操作" width="160" fixed="right">
|
||||||
@@ -101,7 +99,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -120,14 +118,18 @@ let isExpand = false
|
|||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const lists = ref<any[]>([])
|
const lists = ref<any[]>([])
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
status: '',
|
name: '',
|
||||||
name: ''
|
status: ''
|
||||||
})
|
})
|
||||||
const showEdit = ref(false)
|
const showEdit = ref(false)
|
||||||
|
|
||||||
const getLists = async () => {
|
const getLists = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
lists.value = await deptLists(queryParams)
|
try {
|
||||||
loading.value = false
|
lists.value = await deptLists(queryParams)
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const resetParams = () => {
|
const resetParams = () => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="post-lists">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
|
||||||
<el-form-item class="w-[280px]" label="岗位编码">
|
<el-form-item class="w-[280px]" label="岗位编码">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -31,17 +31,18 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
<div>
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
|
<template #toolbar>
|
||||||
<el-button v-perms="['dept.jobs/add']" type="primary" @click="handleAdd()">
|
<el-button v-perms="['dept.jobs/add']" type="primary" @click="handleAdd()">
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<icon name="el-icon-Plus" />
|
<icon name="el-icon-Plus" />
|
||||||
</template>
|
</template>
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</template>
|
||||||
<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
|
<el-table size="large" :data="pager.lists">
|
||||||
<el-table-column label="岗位编码" prop="code" min-width="100" />
|
<el-table-column label="岗位编码" prop="code" min-width="100" />
|
||||||
<el-table-column label="岗位名称" prop="name" min-width="100" />
|
<el-table-column label="岗位名称" prop="name" min-width="100" />
|
||||||
<el-table-column label="排序" prop="sort" min-width="100" />
|
<el-table-column label="排序" prop="sort" min-width="100" />
|
||||||
@@ -75,10 +76,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="flex justify-end mt-4">
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1275,7 +1275,7 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
.float-action.edit {
|
.float-action.edit {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: linear-gradient(135deg, #8b5cf6 0%, #7c3aed 100%);
|
background: linear-gradient(135deg, #0d9488 0%, #0f766e 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.float-action.edit:hover,
|
.float-action.edit:hover,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="admin">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form class="mb-[-16px]" :model="formData" inline>
|
<el-form class="mb-[-16px]" :model="formData" inline>
|
||||||
<el-form-item class="w-[280px]" label="管理员账号">
|
<el-form-item class="w-[280px]" label="管理员账号">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -40,77 +40,78 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never">
|
|
||||||
<el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<template #icon>
|
<template #toolbar>
|
||||||
<icon name="el-icon-Plus" />
|
<el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
|
||||||
</template>
|
<template #icon>
|
||||||
新增
|
<icon name="el-icon-Plus" />
|
||||||
</el-button>
|
</template>
|
||||||
<div class="mt-4">
|
新增
|
||||||
<el-table :data="pager.lists" size="large">
|
</el-button>
|
||||||
<el-table-column label="ID" prop="id" min-width="60" />>
|
</template>
|
||||||
<el-table-column label="头像" min-width="100">
|
<el-table :data="pager.lists" size="large">
|
||||||
<template #default="{ row }">
|
<el-table-column label="ID" prop="id" min-width="60" />
|
||||||
<el-avatar :size="50" :src="row.avatar"></el-avatar>
|
<el-table-column label="头像" min-width="100">
|
||||||
</template>
|
<template #default="{ row }">
|
||||||
</el-table-column>
|
<el-avatar :size="50" :src="row.avatar"></el-avatar>
|
||||||
<el-table-column label="账号" prop="account" min-width="100" />
|
</template>
|
||||||
<el-table-column label="名称" prop="name" min-width="100" />
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="账号" prop="account" min-width="100" />
|
||||||
label="角色"
|
<el-table-column label="名称" prop="name" min-width="100" />
|
||||||
prop="role_name"
|
<el-table-column
|
||||||
min-width="100"
|
label="角色"
|
||||||
show-tooltip-when-overflow
|
prop="role_name"
|
||||||
/>
|
min-width="100"
|
||||||
<el-table-column
|
show-tooltip-when-overflow
|
||||||
label="部门"
|
/>
|
||||||
prop="dept_name"
|
<el-table-column
|
||||||
min-width="100"
|
label="部门"
|
||||||
show-tooltip-when-overflow
|
prop="dept_name"
|
||||||
/>
|
min-width="100"
|
||||||
<el-table-column label="创建时间" prop="create_time" min-width="180" />
|
show-tooltip-when-overflow
|
||||||
<el-table-column label="最近登录时间" prop="login_time" min-width="180" />
|
/>
|
||||||
<el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
|
<el-table-column label="创建时间" prop="create_time" min-width="180" />
|
||||||
<el-table-column label="状态" min-width="100" v-perms="['auth.admin/edit']">
|
<el-table-column label="最近登录时间" prop="login_time" min-width="180" />
|
||||||
<template #default="{ row }">
|
<el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
|
||||||
<el-switch
|
<el-table-column label="状态" min-width="100" v-perms="['auth.admin/edit']">
|
||||||
v-if="row.root != 1"
|
<template #default="{ row }">
|
||||||
v-model="row.disable"
|
<el-switch
|
||||||
:active-value="0"
|
v-if="row.root != 1"
|
||||||
:inactive-value="1"
|
v-model="row.disable"
|
||||||
@change="changeStatus(row)"
|
:active-value="0"
|
||||||
/>
|
:inactive-value="1"
|
||||||
</template>
|
@change="changeStatus(row)"
|
||||||
</el-table-column>
|
/>
|
||||||
<el-table-column label="操作" width="120" fixed="right">
|
</template>
|
||||||
<template #default="{ row }">
|
</el-table-column>
|
||||||
<el-button
|
<el-table-column label="操作" width="120" fixed="right">
|
||||||
v-perms="['auth.admin/edit']"
|
<template #default="{ row }">
|
||||||
type="primary"
|
<el-button
|
||||||
link
|
v-perms="['auth.admin/edit']"
|
||||||
@click="handleEdit(row)"
|
type="primary"
|
||||||
>
|
link
|
||||||
编辑
|
@click="handleEdit(row)"
|
||||||
</el-button>
|
>
|
||||||
<el-button
|
编辑
|
||||||
v-if="row.root != 1"
|
</el-button>
|
||||||
v-perms="['auth.admin/delete']"
|
<el-button
|
||||||
type="danger"
|
v-if="row.root != 1"
|
||||||
link
|
v-perms="['auth.admin/delete']"
|
||||||
@click="handleDelete(row.id)"
|
type="danger"
|
||||||
>
|
link
|
||||||
删除
|
@click="handleDelete(row.id)"
|
||||||
</el-button>
|
>
|
||||||
</template>
|
删除
|
||||||
</el-table-column>
|
</el-button>
|
||||||
</el-table>
|
</template>
|
||||||
</div>
|
</el-table-column>
|
||||||
<div class="flex mt-4 justify-end">
|
</el-table>
|
||||||
|
<template #footer>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -125,7 +126,6 @@ import feedback from '@/utils/feedback'
|
|||||||
import EditPopup from './edit.vue'
|
import EditPopup from './edit.vue'
|
||||||
|
|
||||||
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
|
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
|
||||||
// 表单数据
|
|
||||||
const formData = reactive({
|
const formData = reactive({
|
||||||
account: '',
|
account: '',
|
||||||
name: '',
|
name: '',
|
||||||
|
|||||||
@@ -1,20 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="menu-lists">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<div>
|
<template #toolbar>
|
||||||
<el-button v-perms="['auth.menu/add']" type="primary" @click="handleAdd()">
|
<el-button v-perms="['auth.menu/add']" type="primary" @click="handleAdd()">
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<icon name="el-icon-Plus" />
|
<icon name="el-icon-Plus" />
|
||||||
</template>
|
</template>
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button @click="handleExpand"> 展开/折叠 </el-button>
|
<el-button @click="handleExpand">展开/折叠</el-button>
|
||||||
</div>
|
</template>
|
||||||
<el-table
|
<el-table
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
class="mt-4"
|
|
||||||
size="large"
|
size="large"
|
||||||
v-loading="pager.loading"
|
|
||||||
:data="pager.lists"
|
:data="pager.lists"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||||
@@ -87,7 +85,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</admin-page-data-panel>
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,68 +1,64 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="role-lists">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
<div>
|
<template #toolbar>
|
||||||
<el-button v-perms="['auth.role/add']" type="primary" @click="handleAdd">
|
<el-button v-perms="['auth.role/add']" type="primary" @click="handleAdd">
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<icon name="el-icon-Plus" />
|
<icon name="el-icon-Plus" />
|
||||||
</template>
|
</template>
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</template>
|
||||||
<div class="mt-4" v-loading="pager.loading">
|
<el-table :data="pager.lists" size="large">
|
||||||
<div>
|
<el-table-column prop="id" label="ID" min-width="100" />
|
||||||
<el-table :data="pager.lists" size="large">
|
<el-table-column prop="name" label="名称" min-width="150" />
|
||||||
<el-table-column prop="id" label="ID" min-width="100" />
|
<el-table-column
|
||||||
<el-table-column prop="name" label="名称" min-width="150" />
|
prop="desc"
|
||||||
<el-table-column
|
label="备注"
|
||||||
prop="desc"
|
min-width="150"
|
||||||
label="备注"
|
show-overflow-tooltip
|
||||||
min-width="150"
|
/>
|
||||||
show-overflow-tooltip
|
<el-table-column prop="sort" label="排序" min-width="100" />
|
||||||
/>
|
<el-table-column label="数据范围" min-width="140">
|
||||||
<el-table-column prop="sort" label="排序" min-width="100" />
|
<template #default="{ row }">
|
||||||
<el-table-column label="数据范围" min-width="140">
|
{{ dataScopeLabel(row.data_scope) }}
|
||||||
<template #default="{ row }">
|
</template>
|
||||||
{{ dataScopeLabel(row.data_scope) }}
|
</el-table-column>
|
||||||
</template>
|
<el-table-column prop="num" label="管理员人数" min-width="100" />
|
||||||
</el-table-column>
|
<el-table-column prop="create_time" label="创建时间" min-width="180" />
|
||||||
<el-table-column prop="num" label="管理员人数" min-width="100" />
|
<el-table-column label="操作" width="200" fixed="right">
|
||||||
<el-table-column prop="create_time" label="创建时间" min-width="180" />
|
<template #default="{ row }">
|
||||||
<el-table-column label="操作" width="200" fixed="right">
|
<el-button
|
||||||
<template #default="{ row }">
|
link
|
||||||
<el-button
|
type="primary"
|
||||||
link
|
v-perms="['auth.role/edit']"
|
||||||
type="primary"
|
@click="handleEdit(row)"
|
||||||
v-perms="['auth.role/edit']"
|
>
|
||||||
@click="handleEdit(row)"
|
编辑
|
||||||
>
|
</el-button>
|
||||||
编辑
|
<el-button
|
||||||
</el-button>
|
link
|
||||||
<el-button
|
type="primary"
|
||||||
link
|
v-perms="['auth.role/edit']"
|
||||||
type="primary"
|
@click="handleAuth(row)"
|
||||||
v-perms="['auth.role/edit']"
|
>
|
||||||
@click="handleAuth(row)"
|
分配权限
|
||||||
>
|
</el-button>
|
||||||
分配权限
|
<el-button
|
||||||
</el-button>
|
v-perms="['auth.role/delete']"
|
||||||
<el-button
|
link
|
||||||
v-perms="['auth.role/delete']"
|
type="danger"
|
||||||
link
|
@click="handleDelete(row.id)"
|
||||||
type="danger"
|
>
|
||||||
@click="handleDelete(row.id)"
|
删除
|
||||||
>
|
</el-button>
|
||||||
删除
|
</template>
|
||||||
</el-button>
|
</el-table-column>
|
||||||
</template>
|
</el-table>
|
||||||
</el-table-column>
|
<template #footer>
|
||||||
</el-table>
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
<div class="flex justify-end mt-4">
|
</admin-page-data-panel>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
<auth-popup v-if="showAuth" ref="authRef" @success="getLists" @close="showAuth = false" />
|
<auth-popup v-if="showAuth" ref="authRef" @success="getLists" @close="showAuth = false" />
|
||||||
</div>
|
</div>
|
||||||
@@ -115,7 +111,6 @@ const dataScopeLabel = (scope: number | string | null | undefined) => {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除角色
|
|
||||||
const handleDelete = async (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
await feedback.confirm('确定要删除？')
|
await feedback.confirm('确定要删除？')
|
||||||
await roleDelete({ id })
|
await roleDelete({ id })
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="dict-type">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-page-header class="mb-4" content="数据管理" @back="$router.back()" />
|
<el-page-header class="mb-4" content="数据管理" @back="$router.back()" />
|
||||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
|
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
|
||||||
<el-form-item class="w-[280px]" label="字典名称">
|
<el-form-item class="w-[280px]" label="字典名称">
|
||||||
@@ -28,9 +28,10 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
<div>
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
|
<template #toolbar>
|
||||||
<el-button
|
<el-button
|
||||||
v-perms="['setting.dict.dict_data/add']"
|
v-perms="['setting.dict.dict_data/add']"
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -52,58 +53,54 @@
|
|||||||
</template>
|
</template>
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</template>
|
||||||
<div class="mt-4" v-loading="pager.loading">
|
<el-table
|
||||||
<div>
|
:data="pager.lists"
|
||||||
<el-table
|
size="large"
|
||||||
:data="pager.lists"
|
@selection-change="handleSelectionChange"
|
||||||
size="large"
|
>
|
||||||
@selection-change="handleSelectionChange"
|
<el-table-column type="selection" width="55" />
|
||||||
>
|
<el-table-column label="ID" prop="id" />
|
||||||
<el-table-column type="selection" width="55" />
|
<el-table-column label="数据名称" prop="name" min-width="120" />
|
||||||
<el-table-column label="ID" prop="id" />
|
<el-table-column label="数据值" prop="value" min-width="120" />
|
||||||
<el-table-column label="数据名称" prop="name" min-width="120" />
|
<el-table-column label="状态">
|
||||||
<el-table-column label="数据值" prop="value" min-width="120" />
|
<template v-slot="{ row }">
|
||||||
<el-table-column label="状态">
|
<el-tag v-if="row.status == 1">正常</el-tag>
|
||||||
<template v-slot="{ row }">
|
<el-tag v-else type="danger">停用</el-tag>
|
||||||
<el-tag v-if="row.status == 1">正常</el-tag>
|
</template>
|
||||||
<el-tag v-else type="danger">停用</el-tag>
|
</el-table-column>
|
||||||
</template>
|
<el-table-column
|
||||||
</el-table-column>
|
label="备注"
|
||||||
<el-table-column
|
prop="remark"
|
||||||
label="备注"
|
min-width="120"
|
||||||
prop="remark"
|
show-tooltip-when-overflow
|
||||||
min-width="120"
|
/>
|
||||||
show-tooltip-when-overflow
|
<el-table-column label="排序" prop="sort" />
|
||||||
/>
|
<el-table-column label="操作" width="120" fixed="right">
|
||||||
<el-table-column label="排序" prop="sort" />
|
<template #default="{ row }">
|
||||||
<el-table-column label="操作" width="120" fixed="right">
|
<el-button
|
||||||
<template #default="{ row }">
|
v-perms="['setting.dict.dict_data/edit']"
|
||||||
<el-button
|
link
|
||||||
v-perms="['setting.dict.dict_data/edit']"
|
type="primary"
|
||||||
link
|
@click="handleEdit(row)"
|
||||||
type="primary"
|
>
|
||||||
@click="handleEdit(row)"
|
编辑
|
||||||
>
|
</el-button>
|
||||||
编辑
|
<el-button
|
||||||
</el-button>
|
v-perms="['setting.dict.dict_data/delete']"
|
||||||
<el-button
|
link
|
||||||
v-perms="['setting.dict.dict_data/delete']"
|
type="danger"
|
||||||
link
|
@click="handleDelete(row.id)"
|
||||||
type="danger"
|
>
|
||||||
@click="handleDelete(row.id)"
|
删除
|
||||||
>
|
</el-button>
|
||||||
删除
|
</template>
|
||||||
</el-button>
|
</el-table-column>
|
||||||
</template>
|
</el-table>
|
||||||
</el-table-column>
|
<template #footer>
|
||||||
</el-table>
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
<div class="flex justify-end mt-4">
|
</admin-page-data-panel>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="dict-type">
|
<div>
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
|
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
|
||||||
<el-form-item class="w-[280px]" label="字典名称">
|
<el-form-item class="w-[280px]" label="字典名称">
|
||||||
<el-input v-model="queryParams.name" clearable @keyup.enter="resetPage" />
|
<el-input v-model="queryParams.name" clearable @keyup.enter="resetPage" />
|
||||||
@@ -20,9 +20,10 @@
|
|||||||
<el-button @click="resetParams">重置</el-button>
|
<el-button @click="resetParams">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
<el-card class="!border-none mt-4" shadow="never">
|
|
||||||
<div>
|
<admin-page-data-panel v-loading="pager.loading">
|
||||||
|
<template #toolbar>
|
||||||
<el-button
|
<el-button
|
||||||
v-perms="['setting.dict.dict_type/add']"
|
v-perms="['setting.dict.dict_type/add']"
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -44,69 +45,65 @@
|
|||||||
</template>
|
</template>
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</template>
|
||||||
<div class="mt-4" v-loading="pager.loading">
|
<el-table
|
||||||
<div>
|
:data="pager.lists"
|
||||||
<el-table
|
size="large"
|
||||||
:data="pager.lists"
|
@selection-change="handleSelectionChange"
|
||||||
size="large"
|
>
|
||||||
@selection-change="handleSelectionChange"
|
<el-table-column type="selection" width="55" />
|
||||||
>
|
<el-table-column label="ID" prop="id" />
|
||||||
<el-table-column type="selection" width="55" />
|
<el-table-column label="字典名称" prop="name" min-width="120" />
|
||||||
<el-table-column label="ID" prop="id" />
|
<el-table-column label="字典类型" prop="type" min-width="120" />
|
||||||
<el-table-column label="字典名称" prop="name" min-width="120" />
|
<el-table-column label="状态">
|
||||||
<el-table-column label="字典类型" prop="type" min-width="120" />
|
<template v-slot="{ row }">
|
||||||
<el-table-column label="状态">
|
<el-tag v-if="row.status == 1">正常</el-tag>
|
||||||
<template v-slot="{ row }">
|
<el-tag v-else type="danger">停用</el-tag>
|
||||||
<el-tag v-if="row.status == 1">正常</el-tag>
|
</template>
|
||||||
<el-tag v-else type="danger">停用</el-tag>
|
</el-table-column>
|
||||||
</template>
|
<el-table-column label="备注" prop="remark" show-tooltip-when-overflow />
|
||||||
</el-table-column>
|
<el-table-column label="创建时间" prop="create_time" min-width="180" />
|
||||||
<el-table-column label="备注" prop="remark" show-tooltip-when-overflow />
|
<el-table-column label="操作" width="190" fixed="right">
|
||||||
<el-table-column label="创建时间" prop="create_time" min-width="180" />
|
<template #default="{ row }">
|
||||||
<el-table-column label="操作" width="190" fixed="right">
|
<el-button
|
||||||
<template #default="{ row }">
|
v-perms="['setting.dict.dict_type/edit']"
|
||||||
<el-button
|
link
|
||||||
v-perms="['setting.dict.dict_type/edit']"
|
type="primary"
|
||||||
link
|
@click="handleEdit(row)"
|
||||||
type="primary"
|
>
|
||||||
@click="handleEdit(row)"
|
编辑
|
||||||
>
|
</el-button>
|
||||||
编辑
|
<el-button
|
||||||
</el-button>
|
v-perms="['setting.dict.dict_data/lists']"
|
||||||
<el-button
|
type="primary"
|
||||||
v-perms="['setting.dict.dict_data/lists']"
|
link
|
||||||
type="primary"
|
>
|
||||||
link
|
<router-link
|
||||||
>
|
:to="{
|
||||||
<router-link
|
path: getRoutePath('setting.dict.dict_data/lists'),
|
||||||
:to="{
|
query: {
|
||||||
path: getRoutePath('setting.dict.dict_data/lists'),
|
id: row.id
|
||||||
query: {
|
}
|
||||||
id: row.id
|
}"
|
||||||
}
|
>
|
||||||
}"
|
数据管理
|
||||||
>
|
</router-link>
|
||||||
数据管理
|
</el-button>
|
||||||
</router-link>
|
<el-button
|
||||||
</el-button>
|
v-perms="['setting.dict.dict_type/delete']"
|
||||||
<el-button
|
link
|
||||||
v-perms="['setting.dict.dict_type/delete']"
|
type="danger"
|
||||||
link
|
@click="handleDelete(row.id)"
|
||||||
type="danger"
|
>
|
||||||
@click="handleDelete(row.id)"
|
删除
|
||||||
>
|
</el-button>
|
||||||
删除
|
</template>
|
||||||
</el-button>
|
</el-table-column>
|
||||||
</template>
|
</el-table>
|
||||||
</el-table-column>
|
<template #footer>
|
||||||
</el-table>
|
<pagination v-model="pager" @change="getLists" />
|
||||||
</div>
|
</template>
|
||||||
<div class="flex justify-end mt-4">
|
</admin-page-data-panel>
|
||||||
<pagination v-model="pager" @change="getLists" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -151,7 +148,6 @@ const handleEdit = async (data: any) => {
|
|||||||
editRef.value?.setFormData(data)
|
editRef.value?.setFormData(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除角色
|
|
||||||
const handleDelete = async (id: any[] | number) => {
|
const handleDelete = async (id: any[] | number) => {
|
||||||
await feedback.confirm('确定要删除？')
|
await feedback.confirm('确定要删除？')
|
||||||
await dictTypeDelete({ id })
|
await dictTypeDelete({ id })
|
||||||
|
|||||||
@@ -1,319 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="auto-assign-log-page">
|
|
||||||
<el-card class="!border-none" shadow="never">
|
|
||||||
<el-form :inline="true" class="log-filter-form">
|
|
||||||
<el-form-item label="记录时间">
|
|
||||||
<el-date-picker
|
|
||||||
v-model="timeRange"
|
|
||||||
type="datetimerange"
|
|
||||||
range-separator="至"
|
|
||||||
start-placeholder="开始时间"
|
|
||||||
end-placeholder="结束时间"
|
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
|
||||||
clearable
|
|
||||||
@change="doSearch"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="执行日期">
|
|
||||||
<el-date-picker
|
|
||||||
v-model="dateRange"
|
|
||||||
type="daterange"
|
|
||||||
range-separator="至"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
value-format="YYYY-MM-DD"
|
|
||||||
clearable
|
|
||||||
@change="doSearch"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="结果">
|
|
||||||
<el-select
|
|
||||||
v-model="queryParams.action"
|
|
||||||
clearable
|
|
||||||
placeholder="全部"
|
|
||||||
class="w-[120px]"
|
|
||||||
@change="doSearch"
|
|
||||||
>
|
|
||||||
<el-option label="已分配" value="1" />
|
|
||||||
<el-option label="未分配" value="0" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="回退">
|
|
||||||
<el-select
|
|
||||||
v-model="queryParams.is_rollback"
|
|
||||||
clearable
|
|
||||||
placeholder="全部"
|
|
||||||
class="w-[120px]"
|
|
||||||
@change="doSearch"
|
|
||||||
>
|
|
||||||
<el-option label="未回退" value="0" />
|
|
||||||
<el-option label="已回退" value="1" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="关键词">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.keyword"
|
|
||||||
placeholder="患者/手机号/医助/诊单ID"
|
|
||||||
clearable
|
|
||||||
class="w-[220px]"
|
|
||||||
@keyup.enter="doSearch"
|
|
||||||
@clear="doSearch"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" @click="doSearch">查询</el-button>
|
|
||||||
<el-button @click="handleReset">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<div class="log-hint">
|
|
||||||
由每日定时任务「待分配诊单自动指派」写入：按上月二诊复诊接诊率分档轮询分配（>70% 每人3条/日，60%~70%
|
|
||||||
每人2条/日，50%~60% 每人1条/日，<50% 不分）。「回退」可将已分配医助撤回到自动分配前的原医助（通常为一中心），并写入指派日志。
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
|
|
||||||
<el-card class="!border-none mt-3" shadow="never">
|
|
||||||
<div class="toolbar mb-3">
|
|
||||||
<el-button
|
|
||||||
v-perms="['stats.autoAssignLog/rollback']"
|
|
||||||
type="warning"
|
|
||||||
:disabled="selectedRows.length === 0"
|
|
||||||
:loading="rollbackLoading"
|
|
||||||
@click="handleBatchRollback"
|
|
||||||
>
|
|
||||||
回退选中（{{ selectedRows.length }}）
|
|
||||||
</el-button>
|
|
||||||
<span v-if="selectedRows.length > 0" class="toolbar-tip">
|
|
||||||
已选 {{ selectedRows.length }} 条可回退记录
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<el-table
|
|
||||||
ref="tableRef"
|
|
||||||
:data="pager.lists"
|
|
||||||
v-loading="pager.loading"
|
|
||||||
size="default"
|
|
||||||
stripe
|
|
||||||
row-key="id"
|
|
||||||
@selection-change="onSelectionChange"
|
|
||||||
>
|
|
||||||
<el-table-column
|
|
||||||
type="selection"
|
|
||||||
width="48"
|
|
||||||
:selectable="rowSelectable"
|
|
||||||
reserve-selection
|
|
||||||
/>
|
|
||||||
<el-table-column label="记录时间" width="160">
|
|
||||||
<template #default="{ row }">{{ row.create_time_text || '—' }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="诊单" width="90" prop="diagnosis_id" />
|
|
||||||
<el-table-column label="患者" min-width="110">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<div>{{ row.patient_name || '—' }}</div>
|
|
||||||
<div class="cell-sub">{{ row.patient_phone || '' }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="结果" width="90" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-tag :type="Number(row.action) === 1 ? 'success' : 'info'" size="small">
|
|
||||||
{{ row.action_text }}
|
|
||||||
</el-tag>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="回退状态" width="140">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<template v-if="Number(row.is_rollback) === 1">
|
|
||||||
<el-tag type="warning" size="small">已回退</el-tag>
|
|
||||||
<div class="cell-sub">{{ row.rollback_time_text }}</div>
|
|
||||||
<div v-if="row.rollback_admin_name" class="cell-sub">
|
|
||||||
{{ row.rollback_admin_name }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<el-tag v-else-if="Number(row.can_rollback) === 1" type="success" size="small">
|
|
||||||
可回退
|
|
||||||
</el-tag>
|
|
||||||
<span v-else>—</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="医助" min-width="110">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<template v-if="Number(row.assistant_id) > 0">
|
|
||||||
<div>{{ row.assistant_name || '#' + row.assistant_id }}</div>
|
|
||||||
<div class="cell-sub">上月二诊接诊率 {{ formatRate(row.visit2_rate) }}</div>
|
|
||||||
</template>
|
|
||||||
<span v-else>—</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="档位" width="100" align="center">
|
|
||||||
<template #default="{ row }">{{ row.tier_text || '—' }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="轮次" width="70" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
{{ Number(row.round_no) > 0 ? '第' + row.round_no + '轮' : '—' }}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="原因" min-width="280" show-overflow-tooltip>
|
|
||||||
<template #default="{ row }">{{ row.reason }}</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="统计月" width="90" prop="stat_month" align="center" />
|
|
||||||
<el-table-column label="批次" width="160">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<span class="cell-sub">{{ row.batch_no }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" width="90" fixed="right" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-button
|
|
||||||
v-if="Number(row.can_rollback) === 1"
|
|
||||||
v-perms="['stats.autoAssignLog/rollback']"
|
|
||||||
link
|
|
||||||
type="warning"
|
|
||||||
:loading="rollbackLoading"
|
|
||||||
@click="handleSingleRollback(row)"
|
|
||||||
>
|
|
||||||
回退
|
|
||||||
</el-button>
|
|
||||||
<span v-else class="cell-sub">—</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<div class="flex justify-end mt-4">
|
|
||||||
<pagination v-model="pager" @change="getLists" />
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts" name="statsAutoAssignLog">
|
|
||||||
import { autoAssignLogLists, autoAssignLogRollback } from '@/api/stats'
|
|
||||||
import { usePaging } from '@/hooks/usePaging'
|
|
||||||
import feedback from '@/utils/feedback'
|
|
||||||
import { onMounted, reactive, ref, watch } from 'vue'
|
|
||||||
|
|
||||||
const dateRange = ref<[string, string] | null>(null)
|
|
||||||
const timeRange = ref<[string, string] | null>(null)
|
|
||||||
const tableRef = ref()
|
|
||||||
const selectedRows = ref<any[]>([])
|
|
||||||
const rollbackLoading = ref(false)
|
|
||||||
|
|
||||||
const queryParams = reactive({
|
|
||||||
start_date: '',
|
|
||||||
end_date: '',
|
|
||||||
start_time: '',
|
|
||||||
end_time: '',
|
|
||||||
action: '' as '' | '0' | '1',
|
|
||||||
is_rollback: '' as '' | '0' | '1',
|
|
||||||
keyword: ''
|
|
||||||
})
|
|
||||||
|
|
||||||
watch(dateRange, (val) => {
|
|
||||||
queryParams.start_date = val?.[0] ?? ''
|
|
||||||
queryParams.end_date = val?.[1] ?? ''
|
|
||||||
})
|
|
||||||
|
|
||||||
watch(timeRange, (val) => {
|
|
||||||
queryParams.start_time = val?.[0] ?? ''
|
|
||||||
queryParams.end_time = val?.[1] ?? ''
|
|
||||||
})
|
|
||||||
|
|
||||||
const { pager, getLists, resetPage } = usePaging({
|
|
||||||
fetchFun: autoAssignLogLists,
|
|
||||||
params: queryParams
|
|
||||||
})
|
|
||||||
|
|
||||||
const doSearch = () => {
|
|
||||||
selectedRows.value = []
|
|
||||||
tableRef.value?.clearSelection?.()
|
|
||||||
resetPage()
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleReset = () => {
|
|
||||||
dateRange.value = null
|
|
||||||
timeRange.value = null
|
|
||||||
queryParams.start_date = ''
|
|
||||||
queryParams.end_date = ''
|
|
||||||
queryParams.start_time = ''
|
|
||||||
queryParams.end_time = ''
|
|
||||||
queryParams.action = ''
|
|
||||||
queryParams.is_rollback = ''
|
|
||||||
queryParams.keyword = ''
|
|
||||||
doSearch()
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatRate = (rate: number | null | undefined) =>
|
|
||||||
rate === null || rate === undefined ? '—' : `${rate}%`
|
|
||||||
|
|
||||||
const rowSelectable = (row: any) => Number(row.can_rollback) === 1
|
|
||||||
|
|
||||||
const onSelectionChange = (rows: any[]) => {
|
|
||||||
selectedRows.value = rows.filter((r) => Number(r.can_rollback) === 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
const runRollback = async (ids: number[]) => {
|
|
||||||
if (ids.length === 0) return
|
|
||||||
await feedback.confirm(
|
|
||||||
`确认回退选中的 ${ids.length} 条自动分配？将把诊单医助撤回到自动分配前的原医助，并写入指派日志。`
|
|
||||||
)
|
|
||||||
rollbackLoading.value = true
|
|
||||||
try {
|
|
||||||
const res: any = await autoAssignLogRollback({ ids })
|
|
||||||
const success = Number(res?.success ?? 0)
|
|
||||||
const failed = Number(res?.failed ?? 0)
|
|
||||||
if (failed > 0 && Array.isArray(res?.messages) && res.messages.length) {
|
|
||||||
feedback.msgWarning(
|
|
||||||
`回退成功 ${success} 条，跳过/失败 ${failed} 条：${res.messages.slice(0, 3).join('；')}`
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
feedback.msgSuccess(`回退成功 ${success} 条`)
|
|
||||||
}
|
|
||||||
selectedRows.value = []
|
|
||||||
tableRef.value?.clearSelection?.()
|
|
||||||
await getLists()
|
|
||||||
} finally {
|
|
||||||
rollbackLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleBatchRollback = () => {
|
|
||||||
const ids = selectedRows.value.map((r) => Number(r.id)).filter((id) => id > 0)
|
|
||||||
return runRollback(ids)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleSingleRollback = (row: any) => {
|
|
||||||
const id = Number(row?.id ?? 0)
|
|
||||||
if (id <= 0) return
|
|
||||||
return runRollback([id])
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => getLists())
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.auto-assign-log-page {
|
|
||||||
.log-filter-form {
|
|
||||||
:deep(.el-form-item) {
|
|
||||||
margin-bottom: 8px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.log-hint {
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--el-text-color-secondary);
|
|
||||||
line-height: 1.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toolbar {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toolbar-tip {
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--el-text-color-secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cell-sub {
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--el-text-color-secondary);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="conversion-stats-page">
|
<div class="conversion-stats-page">
|
||||||
<el-card class="!border-none" shadow="never">
|
<admin-page-filter-panel>
|
||||||
<el-form :inline="true" :model="queryParams" class="stats-filter-form">
|
<el-form :inline="true" :model="queryParams" class="stats-filter-form">
|
||||||
<el-form-item label="统计维度">
|
<el-form-item label="统计维度">
|
||||||
<el-segmented
|
<el-segmented
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
<el-button @click="handleReset">重置</el-button>
|
<el-button @click="handleReset">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</admin-page-filter-panel>
|
||||||
|
|
||||||
<div class="stats-kpi-grid">
|
<div class="stats-kpi-grid">
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<el-tree-select
|
<el-tree-select
|
||||||
v-model="deptId"
|
v-model="deptId"
|
||||||
:data="deptTreeOptions"
|
:data="deptTreeOptions"
|
||||||
placeholder="二中心（全部）"
|
placeholder="全部部门"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
check-strictly
|
check-strictly
|
||||||
@@ -43,10 +43,10 @@
|
|||||||
</template>
|
</template>
|
||||||
<div class="rate-caliber">
|
<div class="rate-caliber">
|
||||||
<p>
|
<p>
|
||||||
<b>当月被指派总数</b>：当月内诊单被指派给医助（按指派操作时间落月，<b>剔除勾选「继承」的指派</b>)的诊单数，按「医助 × 诊单」去重；部门行 / 合计行按诊单去重；<b>再剔除</b>名下存在履约「拒收 / 退款」业务订单的诊单。
|
<b>当月被指派总数</b>：当月内诊单被指派给医助（按指派操作时间落月，<b>剔除勾选「继承」的指派</b>)的诊单数，按「医助 × 诊单」去重；部门行 / 合计行按诊单去重。
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<b>诊次（第 N 次下单）</b>：患者（诊单）名下计入业绩的业务订单（剔除已取消 / 拒收 / 退款）按下单时间升序编号为「实单序号」，<b>统计诊次 = 实单序号 + 诊单偏移</b>（默认偏移 0 → 第 1 笔实单为一诊；偏移 1 → 第 1 笔实单为二诊；偏移 2 → 第 1 笔实单为三诊，5 笔实单等价七诊）。诊次<b>跨月累计不重置</b>。诊单可在「业务订单」tab 配置偏移量。
|
<b>诊次（第 N 次下单）</b>：患者（诊单）名下计入业绩的业务订单（剔除已取消 / 拒收 / 退款）按下单时间升序的全局序号，<b>跨月累计不重置</b>——如 5 月指派后旗下成交 4 单为二诊~五诊，下月再成交即为六诊。
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<b>当月 N 诊单数</b>：当月内下单且诊次为 N 的订单数，归属下单时点<b>持有该患者的医助</b>（指派可在往月；释放后不再归属；「继承」指派会转移持有人但不计被指派数）。
|
<b>当月 N 诊单数</b>：当月内下单且诊次为 N 的订单数，归属下单时点<b>持有该患者的医助</b>（指派可在往月；释放后不再归属；「继承」指派会转移持有人但不计被指派数）。
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
<b>当月 N 诊接诊率</b> = 当月 N 诊单数 ÷ 当月被指派总数。往月指派、当月成交会推高分子，比率可能超过 100%；医助当月无新指派但旗下有成交时，被指派数为 0、比率显示「—」。
|
<b>当月 N 诊接诊率</b> = 当月 N 诊单数 ÷ 当月被指派总数。往月指派、当月成交会推高分子，比率可能超过 100%；医助当月无新指派但旗下有成交时，被指派数为 0、比率显示「—」。
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
医助按人事部门归组；<b>仅统计「二中心」及其组织下级</b>；部门下拉与未选时的默认范围均限定在该子树，选定部门时含其组织下级。
|
医助按人事部门归组；选定部门时含其组织下级。
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
|
|||||||
@@ -83,23 +83,6 @@
|
|||||||
<el-radio-button value="0">未确认</el-radio-button>
|
<el-radio-button value="0">未确认</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</div>
|
</div>
|
||||||
<div class="filter-group">
|
|
||||||
<span class="filter-label">部门</span>
|
|
||||||
<el-tree-select
|
|
||||||
v-model="formData.assistant_dept_id"
|
|
||||||
:data="departmentTreeRaw"
|
|
||||||
class="filter-dept-select"
|
|
||||||
clearable
|
|
||||||
filterable
|
|
||||||
check-strictly
|
|
||||||
:default-expand-all="true"
|
|
||||||
node-key="id"
|
|
||||||
size="small"
|
|
||||||
:props="assistantDeptTreeProps"
|
|
||||||
placeholder="选父级含子级"
|
|
||||||
@change="handleAssistantDeptChange"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
@@ -559,7 +542,6 @@
|
|||||||
import { usePaging } from '@/hooks/usePaging'
|
import { usePaging } from '@/hooks/usePaging'
|
||||||
import { defineAsyncComponent, onMounted, onUnmounted, watch } from 'vue'
|
import { defineAsyncComponent, onMounted, onUnmounted, watch } from 'vue'
|
||||||
import { appointmentLists, cancelAppointment, completeAppointment, appointmentDetail } from '@/api/doctor'
|
import { appointmentLists, cancelAppointment, completeAppointment, appointmentDetail } from '@/api/doctor'
|
||||||
import { deptAll } from '@/api/org/department'
|
|
||||||
import { getCallSignature, generateMiniProgramQrcode, tcmDiagnosisDetail, prescriptionGetByAppointment } from '@/api/tcm'
|
import { getCallSignature, generateMiniProgramQrcode, tcmDiagnosisDetail, prescriptionGetByAppointment } from '@/api/tcm'
|
||||||
import { getDictData } from '@/api/app'
|
import { getDictData } from '@/api/app'
|
||||||
import { addDoctorNote } from '@/api/patient'
|
import { addDoctorNote } from '@/api/patient'
|
||||||
@@ -621,19 +603,10 @@ const formData = reactive({
|
|||||||
end_date: '',
|
end_date: '',
|
||||||
date_preset: 'today' as '' | 'yesterday' | 'day_before' | 'today' | 'tomorrow' | 'day_after',
|
date_preset: 'today' as '' | 'yesterday' | 'day_before' | 'today' | 'tomorrow' | 'day_after',
|
||||||
diagnosis_confirmed: '' as '' | '0' | '1', // ''=全部 1=已确认 0=未确认
|
diagnosis_confirmed: '' as '' | '0' | '1', // ''=全部 1=已确认 0=未确认
|
||||||
/** 接诊医生 / 诊单医助 / 挂号医助所属部门（选父级含子级） */
|
|
||||||
assistant_dept_id: '' as number | '',
|
|
||||||
/** 为 1 时后端 extend 返回各状态数量，避免额外 4 次列表请求 */
|
/** 为 1 时后端 extend 返回各状态数量，避免额外 4 次列表请求 */
|
||||||
include_status_counts: 0 as 0 | 1
|
include_status_counts: 0 as 0 | 1
|
||||||
})
|
})
|
||||||
|
|
||||||
const departmentTreeRaw = ref<unknown[]>([])
|
|
||||||
const assistantDeptTreeProps = {
|
|
||||||
value: 'id',
|
|
||||||
label: 'name',
|
|
||||||
children: 'children'
|
|
||||||
}
|
|
||||||
|
|
||||||
const activeTab = ref('1')
|
const activeTab = ref('1')
|
||||||
const dateCustomVisible = ref(false)
|
const dateCustomVisible = ref(false)
|
||||||
const statusCount = ref<Record<number, number>>({
|
const statusCount = ref<Record<number, number>>({
|
||||||
@@ -748,12 +721,6 @@ const handleDiagnosisConfirmedChange = () => {
|
|||||||
loadData()
|
loadData()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 部门筛选变更
|
|
||||||
const handleAssistantDeptChange = () => {
|
|
||||||
pager.page = 1
|
|
||||||
loadData()
|
|
||||||
}
|
|
||||||
|
|
||||||
// 快捷日期变更
|
// 快捷日期变更
|
||||||
const handleDatePresetChange = (val: string | number | boolean | undefined) => {
|
const handleDatePresetChange = (val: string | number | boolean | undefined) => {
|
||||||
const v = String(val || '')
|
const v = String(val || '')
|
||||||
@@ -803,7 +770,6 @@ const handleReset = () => {
|
|||||||
formData.doctor_name = ''
|
formData.doctor_name = ''
|
||||||
formData.date_preset = 'today'
|
formData.date_preset = 'today'
|
||||||
formData.diagnosis_confirmed = ''
|
formData.diagnosis_confirmed = ''
|
||||||
formData.assistant_dept_id = ''
|
|
||||||
const t = new Date()
|
const t = new Date()
|
||||||
const p = (n: number) => String(n).padStart(2, '0')
|
const p = (n: number) => String(n).padStart(2, '0')
|
||||||
formData.start_date = `${t.getFullYear()}-${p(t.getMonth() + 1)}-${p(t.getDate())}`
|
formData.start_date = `${t.getFullYear()}-${p(t.getMonth() + 1)}-${p(t.getDate())}`
|
||||||
@@ -1133,13 +1099,7 @@ formData.start_date = `${_today.getFullYear()}-${_pad(_today.getMonth() + 1)}-${
|
|||||||
formData.end_date = formData.start_date
|
formData.end_date = formData.start_date
|
||||||
formData.status = 1
|
formData.status = 1
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(() => {
|
||||||
try {
|
|
||||||
const deptTree = await deptAll()
|
|
||||||
departmentTreeRaw.value = Array.isArray(deptTree) ? deptTree : []
|
|
||||||
} catch {
|
|
||||||
departmentTreeRaw.value = []
|
|
||||||
}
|
|
||||||
loadData()
|
loadData()
|
||||||
listPollTimer = setInterval(() => {
|
listPollTimer = setInterval(() => {
|
||||||
loadData({ silent: true })
|
loadData({ silent: true })
|
||||||
@@ -1268,10 +1228,6 @@ onUnmounted(() => {
|
|||||||
padding: 6px 14px;
|
padding: 6px 14px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter-dept-select {
|
|
||||||
width: 200px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,43 +4,6 @@
|
|||||||
<el-empty description="当前诊单未携带患者ID，无法列出业务订单" />
|
<el-empty description="当前诊单未携带患者ID，无法列出业务订单" />
|
||||||
</div>
|
</div>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="diagnosisId > 0" class="po-revisit-offset-bar mb-3">
|
|
||||||
<div class="po-revisit-offset-bar__main">
|
|
||||||
<span class="text-sm text-gray-600">复诊统计起始偏移</span>
|
|
||||||
<el-tooltip placement="top">
|
|
||||||
<template #content>
|
|
||||||
<div class="max-w-xs leading-relaxed">
|
|
||||||
在实单诊次序号上叠加偏移量。设为 0（默认）：第 1 笔实单计为一诊；设为 1：第 1 笔实单计为二诊；设为 2：第 1 笔实单计为三诊——若有 5 笔实单且偏移 2，则统计上相当于计至七诊（5+2）。
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<el-icon class="text-gray-400 align-middle ml-1"><QuestionFilled /></el-icon>
|
|
||||||
</el-tooltip>
|
|
||||||
<el-input-number
|
|
||||||
v-model="revisitSlotStartOffset"
|
|
||||||
v-perms="['tcm.diagnosis/setRevisitSlotStartOffset']"
|
|
||||||
:min="0"
|
|
||||||
:max="20"
|
|
||||||
:step="1"
|
|
||||||
controls-position="right"
|
|
||||||
class="w-[120px] ml-3"
|
|
||||||
:disabled="offsetSaving"
|
|
||||||
/>
|
|
||||||
<span class="text-xs text-gray-500 ml-2">
|
|
||||||
第 1 笔实单计为{{ visitSlotStartLabel }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<el-button
|
|
||||||
v-perms="['tcm.diagnosis/setRevisitSlotStartOffset']"
|
|
||||||
type="primary"
|
|
||||||
size="small"
|
|
||||||
:loading="offsetSaving"
|
|
||||||
:disabled="!offsetDirty"
|
|
||||||
@click="saveRevisitSlotStartOffset"
|
|
||||||
>
|
|
||||||
保存
|
|
||||||
</el-button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
v-loading="pager.loading"
|
v-loading="pager.loading"
|
||||||
:data="pager.lists"
|
:data="pager.lists"
|
||||||
@@ -49,23 +12,6 @@
|
|||||||
empty-text="暂无业务订单"
|
empty-text="暂无业务订单"
|
||||||
>
|
>
|
||||||
<el-table-column label="订单编号" prop="order_no" min-width="200" show-overflow-tooltip />
|
<el-table-column label="订单编号" prop="order_no" min-width="200" show-overflow-tooltip />
|
||||||
<el-table-column label="全局诊次" width="96" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<span v-if="row.global_visit_seq">{{ row.global_visit_seq }}诊</span>
|
|
||||||
<span v-else class="text-gray-400">—</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="计入统计" width="96" align="center">
|
|
||||||
<template #default="{ row }">
|
|
||||||
<el-tag
|
|
||||||
v-if="row.counts_for_revisit_rate"
|
|
||||||
type="success"
|
|
||||||
size="small"
|
|
||||||
effect="plain"
|
|
||||||
>是</el-tag>
|
|
||||||
<el-tag v-else type="info" size="small" effect="plain">否</el-tag>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="金额" width="120" align="right">
|
<el-table-column label="金额" width="120" align="right">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<span class="text-red-500 font-semibold">¥{{ formatAmount(row.amount) }}</span>
|
<span class="text-red-500 font-semibold">¥{{ formatAmount(row.amount) }}</span>
|
||||||
@@ -117,11 +63,9 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, reactive, ref, watch } from 'vue'
|
import { computed, reactive, ref, watch } from 'vue'
|
||||||
import { QuestionFilled } from '@element-plus/icons-vue'
|
|
||||||
import { usePaging } from '@/hooks/usePaging'
|
import { usePaging } from '@/hooks/usePaging'
|
||||||
import { prescriptionOrderLists, tcmDiagnosisDetail, tcmDiagnosisSetRevisitSlotStartOffset } from '@/api/tcm'
|
import { prescriptionOrderLists } from '@/api/tcm'
|
||||||
import PrescriptionOrderDetailDrawer from '@/views/consumer/prescription/components/PrescriptionOrderDetailDrawer.vue'
|
import PrescriptionOrderDetailDrawer from '@/views/consumer/prescription/components/PrescriptionOrderDetailDrawer.vue'
|
||||||
import feedback from '@/utils/feedback'
|
|
||||||
import {
|
import {
|
||||||
formatTime,
|
formatTime,
|
||||||
fulfillmentText,
|
fulfillmentText,
|
||||||
@@ -147,26 +91,6 @@ const { pager, getLists, resetPage } = usePaging({
|
|||||||
size: 10
|
size: 10
|
||||||
})
|
})
|
||||||
|
|
||||||
const revisitSlotStartOffset = ref(0)
|
|
||||||
const savedRevisitSlotStartOffset = ref(0)
|
|
||||||
const offsetSaving = ref(false)
|
|
||||||
const offsetLoading = ref(false)
|
|
||||||
|
|
||||||
const offsetDirty = computed(
|
|
||||||
() => Number(revisitSlotStartOffset.value) !== Number(savedRevisitSlotStartOffset.value)
|
|
||||||
)
|
|
||||||
|
|
||||||
const visitSlotStartLabel = computed(() => {
|
|
||||||
const raw = Number(revisitSlotStartOffset.value)
|
|
||||||
const offset = Number.isFinite(raw) ? raw : 0
|
|
||||||
const slot = offset + 1
|
|
||||||
const cn = ['', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']
|
|
||||||
if (slot >= 1 && slot <= 10) {
|
|
||||||
return cn[slot] + '诊'
|
|
||||||
}
|
|
||||||
return `第${slot}诊`
|
|
||||||
})
|
|
||||||
|
|
||||||
const buildParams = () => {
|
const buildParams = () => {
|
||||||
Object.keys(queryParams).forEach((k) => delete queryParams[k])
|
Object.keys(queryParams).forEach((k) => delete queryParams[k])
|
||||||
if (props.diagnosisId > 0) {
|
if (props.diagnosisId > 0) {
|
||||||
@@ -178,47 +102,6 @@ const buildParams = () => {
|
|||||||
queryParams.scene = 'diagnosis_edit'
|
queryParams.scene = 'diagnosis_edit'
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadRevisitSlotStartOffset() {
|
|
||||||
if (props.diagnosisId <= 0) return
|
|
||||||
offsetLoading.value = true
|
|
||||||
try {
|
|
||||||
const res: any = await tcmDiagnosisDetail({ id: props.diagnosisId })
|
|
||||||
const d = res?.data ?? res ?? {}
|
|
||||||
const offset = Number(d.revisit_slot_start_offset)
|
|
||||||
const val = Number.isFinite(offset) && offset >= 0 && offset <= 20 ? offset : 0
|
|
||||||
revisitSlotStartOffset.value = val
|
|
||||||
savedRevisitSlotStartOffset.value = val
|
|
||||||
} catch {
|
|
||||||
revisitSlotStartOffset.value = 0
|
|
||||||
savedRevisitSlotStartOffset.value = 0
|
|
||||||
} finally {
|
|
||||||
offsetLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveRevisitSlotStartOffset() {
|
|
||||||
if (props.diagnosisId <= 0) return
|
|
||||||
const offset = Number(revisitSlotStartOffset.value)
|
|
||||||
if (!Number.isFinite(offset) || offset < 0 || offset > 20) {
|
|
||||||
feedback.msgWarning('起始偏移须在 0～20 之间')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
offsetSaving.value = true
|
|
||||||
try {
|
|
||||||
await tcmDiagnosisSetRevisitSlotStartOffset({
|
|
||||||
id: props.diagnosisId,
|
|
||||||
revisit_slot_start_offset: offset
|
|
||||||
})
|
|
||||||
savedRevisitSlotStartOffset.value = offset
|
|
||||||
feedback.msgSuccess('保存成功')
|
|
||||||
getLists()
|
|
||||||
} catch {
|
|
||||||
/* 拦截器已提示 */
|
|
||||||
} finally {
|
|
||||||
offsetSaving.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ─── 详情抽屉（共享组件，数据拉取/展示全部在组件内） ───
|
// ─── 详情抽屉（共享组件，数据拉取/展示全部在组件内） ───
|
||||||
const detailDrawerRef = ref<InstanceType<typeof PrescriptionOrderDetailDrawer>>()
|
const detailDrawerRef = ref<InstanceType<typeof PrescriptionOrderDetailDrawer>>()
|
||||||
|
|
||||||
@@ -234,13 +117,8 @@ const formatAmount = (value: unknown) => {
|
|||||||
watch(
|
watch(
|
||||||
() => [props.diagnosisId, patientIdNum.value] as const,
|
() => [props.diagnosisId, patientIdNum.value] as const,
|
||||||
() => {
|
() => {
|
||||||
if (!patientIdAvailable.value) {
|
if (!patientIdAvailable.value) { pager.lists = []; pager.count = 0; return }
|
||||||
pager.lists = []
|
|
||||||
pager.count = 0
|
|
||||||
return
|
|
||||||
}
|
|
||||||
buildParams()
|
buildParams()
|
||||||
void loadRevisitSlotStartOffset()
|
|
||||||
resetPage()
|
resetPage()
|
||||||
},
|
},
|
||||||
{ immediate: true }
|
{ immediate: true }
|
||||||
@@ -256,21 +134,4 @@ defineExpose({ refresh: () => getLists() })
|
|||||||
.po-empty-tip {
|
.po-empty-tip {
|
||||||
padding: 24px 0;
|
padding: 24px 0;
|
||||||
}
|
}
|
||||||
.po-revisit-offset-bar {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 12px;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
padding: 12px 14px;
|
|
||||||
border: 1px solid var(--el-border-color-lighter);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: var(--el-fill-color-lighter);
|
|
||||||
}
|
|
||||||
.po-revisit-offset-bar__main {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 4px;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -121,16 +121,6 @@
|
|||||||
end-placeholder="最近挂号结束"
|
end-placeholder="最近挂号结束"
|
||||||
@change="handleLatestAppointmentFilterChange"
|
@change="handleLatestAppointmentFilterChange"
|
||||||
/>
|
/>
|
||||||
<daterange-picker
|
|
||||||
class="latest-assign-range"
|
|
||||||
v-model:startTime="formData.latest_assign_start_date"
|
|
||||||
v-model:endTime="formData.latest_assign_end_date"
|
|
||||||
picker-type="daterange"
|
|
||||||
value-format="YYYY-MM-DD"
|
|
||||||
start-placeholder="最近指派开始"
|
|
||||||
end-placeholder="最近指派结束"
|
|
||||||
@change="handleLatestAssignFilterChange"
|
|
||||||
/>
|
|
||||||
<el-select
|
<el-select
|
||||||
v-model="formData.latest_appointment_channel_source"
|
v-model="formData.latest_appointment_channel_source"
|
||||||
placeholder="最近挂号渠道"
|
placeholder="最近挂号渠道"
|
||||||
@@ -183,7 +173,6 @@
|
|||||||
v-loading="pager.loading"
|
v-loading="pager.loading"
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
@row-dblclick="goReadonly"
|
@row-dblclick="goReadonly"
|
||||||
@sort-change="handleTableSortChange"
|
|
||||||
:row-class-name="getRowClassName"
|
:row-class-name="getRowClassName"
|
||||||
class="diagnosis-table"
|
class="diagnosis-table"
|
||||||
stripe
|
stripe
|
||||||
@@ -294,14 +283,7 @@
|
|||||||
<span v-else class="status-unprescribed">未开方</span>
|
<span v-else class="status-unprescribed">未开方</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="未服务天数" width="110" align="center">
|
||||||
label="未服务天数"
|
|
||||||
prop="unserved_days"
|
|
||||||
width="110"
|
|
||||||
align="center"
|
|
||||||
sortable="custom"
|
|
||||||
:sort-orders="['descending', 'ascending']"
|
|
||||||
>
|
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-tooltip
|
<el-tooltip
|
||||||
v-if="row.last_blood_record_at"
|
v-if="row.last_blood_record_at"
|
||||||
@@ -780,10 +762,6 @@ const formData = reactive({
|
|||||||
latest_appointment_start_date: '' as string,
|
latest_appointment_start_date: '' as string,
|
||||||
latest_appointment_end_date: '' as string,
|
latest_appointment_end_date: '' as string,
|
||||||
latest_appointment_channel_source: '' as string,
|
latest_appointment_channel_source: '' as string,
|
||||||
latest_assign_start_date: '' as string,
|
|
||||||
latest_assign_end_date: '' as string,
|
|
||||||
/** 未服务天数排序：desc=天数多到少 asc=少到多 */
|
|
||||||
sort_unserved_days: '' as '' | 'asc' | 'desc',
|
|
||||||
diagnosis_confirmed: '' as '' | '0' | '1',
|
diagnosis_confirmed: '' as '' | '0' | '1',
|
||||||
appointment_date: '' as string,
|
appointment_date: '' as string,
|
||||||
has_appointment: '' as '' | '0' | '1',
|
has_appointment: '' as '' | '0' | '1',
|
||||||
@@ -871,50 +849,22 @@ function resolvePendingAssignOrderMonthForRequest(): string {
|
|||||||
return dayjs().format('YYYY-MM')
|
return dayjs().format('YYYY-MM')
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 除顶部 Tab 专属条件外，与主列表共用的「更多筛选」参数（角标 count 需同步） */
|
|
||||||
function buildSharedDiagnosisFilterPayload(): Record<string, unknown> {
|
|
||||||
return {
|
|
||||||
keyword: formData.keyword,
|
|
||||||
diagnosis_type: formData.diagnosis_type,
|
|
||||||
syndrome_type: formData.syndrome_type,
|
|
||||||
assistant_id: formData.assistant_id,
|
|
||||||
diagnosis_confirmed: formData.diagnosis_confirmed,
|
|
||||||
has_appointment: formData.has_appointment,
|
|
||||||
latest_appointment_start_date: formData.latest_appointment_start_date,
|
|
||||||
latest_appointment_end_date: formData.latest_appointment_end_date,
|
|
||||||
latest_appointment_channel_source: formData.latest_appointment_channel_source,
|
|
||||||
latest_assign_start_date: formData.latest_assign_start_date,
|
|
||||||
latest_assign_end_date: formData.latest_assign_end_date
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 顶部 Tab 角标 count 请求：带上共用筛选，再叠加各 Tab 专属条件 */
|
|
||||||
function buildDateCountRequestPayload(overrides: Record<string, unknown> = {}): Record<string, unknown> {
|
|
||||||
return {
|
|
||||||
page_no: 1,
|
|
||||||
page_size: 1,
|
|
||||||
...buildSharedDiagnosisFilterPayload(),
|
|
||||||
appointment_date: '',
|
|
||||||
pending_booking: '',
|
|
||||||
completed_appointment: '',
|
|
||||||
pending_assign: '',
|
|
||||||
pending_assign_order_month: '',
|
|
||||||
pending_assign_keyword: '',
|
|
||||||
sort_unserved_days: '',
|
|
||||||
...overrides
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 待分配角标 count 请求：与列表同条件，且去掉其它顶部 Tab 残留（如默认「当天挂号」） */
|
/** 待分配角标 count 请求：与列表同条件，且去掉其它顶部 Tab 残留（如默认「当天挂号」） */
|
||||||
function buildPendingAssignCountPayload(): Record<string, unknown> {
|
function buildPendingAssignCountPayload(): Record<string, unknown> {
|
||||||
return buildTcmDiagnosisListRequestPayload(
|
return buildTcmDiagnosisListRequestPayload({
|
||||||
buildDateCountRequestPayload({
|
...formData,
|
||||||
pending_assign: 1,
|
page_no: 1,
|
||||||
has_appointment: '',
|
page_size: 1,
|
||||||
pending_assign_order_month: resolvePendingAssignOrderMonthForRequest(),
|
pending_assign: 1,
|
||||||
pending_assign_keyword: formData.pending_assign_keyword
|
appointment_date: '',
|
||||||
}) as Record<string, unknown>
|
has_appointment: '',
|
||||||
) as Record<string, unknown>
|
pending_booking: '',
|
||||||
|
completed_appointment: '',
|
||||||
|
latest_appointment_start_date: '',
|
||||||
|
latest_appointment_end_date: '',
|
||||||
|
latest_appointment_channel_source: '',
|
||||||
|
pending_assign_order_month: resolvePendingAssignOrderMonthForRequest()
|
||||||
|
} as Record<string, unknown>) as Record<string, unknown>
|
||||||
}
|
}
|
||||||
|
|
||||||
const fetchTcmDiagnosisListsForPaging = (req: Record<string, unknown>) =>
|
const fetchTcmDiagnosisListsForPaging = (req: Record<string, unknown>) =>
|
||||||
@@ -943,9 +893,6 @@ function clearSecondaryFiltersWhenPendingAssignWideSearch() {
|
|||||||
formData.latest_appointment_start_date = ''
|
formData.latest_appointment_start_date = ''
|
||||||
formData.latest_appointment_end_date = ''
|
formData.latest_appointment_end_date = ''
|
||||||
formData.latest_appointment_channel_source = ''
|
formData.latest_appointment_channel_source = ''
|
||||||
formData.latest_assign_start_date = ''
|
|
||||||
formData.latest_assign_end_date = ''
|
|
||||||
formData.sort_unserved_days = ''
|
|
||||||
formData.pending_assign_order_month = ''
|
formData.pending_assign_order_month = ''
|
||||||
activeTab.value = 'all'
|
activeTab.value = 'all'
|
||||||
if (kw1 !== '') {
|
if (kw1 !== '') {
|
||||||
@@ -1047,26 +994,14 @@ const onPendingAssignOrderMonthChange = async (val: string | null) => {
|
|||||||
const fetchDateCounts = async () => {
|
const fetchDateCounts = async () => {
|
||||||
try {
|
try {
|
||||||
const [yesterday, dayBefore, today, tomorrow, dayAfter, all, noApt, doneVisit, pending] = await Promise.all([
|
const [yesterday, dayBefore, today, tomorrow, dayAfter, all, noApt, doneVisit, pending] = await Promise.all([
|
||||||
tcmDiagnosisLists(
|
tcmDiagnosisLists({ appointment_date: yesterdayStr.value, page_no: 1, page_size: 1 }),
|
||||||
buildDateCountRequestPayload({ appointment_date: yesterdayStr.value, has_appointment: '' }) as any
|
tcmDiagnosisLists({ appointment_date: dayBeforeStr.value, page_no: 1, page_size: 1 }),
|
||||||
),
|
tcmDiagnosisLists({ appointment_date: todayStr.value, page_no: 1, page_size: 1 }),
|
||||||
tcmDiagnosisLists(
|
tcmDiagnosisLists({ appointment_date: tomorrowStr.value, page_no: 1, page_size: 1 }),
|
||||||
buildDateCountRequestPayload({ appointment_date: dayBeforeStr.value, has_appointment: '' }) as any
|
tcmDiagnosisLists({ appointment_date: dayAfterStr.value, page_no: 1, page_size: 1 }),
|
||||||
),
|
tcmDiagnosisLists({ page_no: 1, page_size: 1 }),
|
||||||
tcmDiagnosisLists(
|
tcmDiagnosisLists({ has_appointment: 0, page_no: 1, page_size: 1 }),
|
||||||
buildDateCountRequestPayload({ appointment_date: todayStr.value, has_appointment: '' }) as any
|
tcmDiagnosisLists({ completed_appointment: 1, page_no: 1, page_size: 1 }),
|
||||||
),
|
|
||||||
tcmDiagnosisLists(
|
|
||||||
buildDateCountRequestPayload({ appointment_date: tomorrowStr.value, has_appointment: '' }) as any
|
|
||||||
),
|
|
||||||
tcmDiagnosisLists(
|
|
||||||
buildDateCountRequestPayload({ appointment_date: dayAfterStr.value, has_appointment: '' }) as any
|
|
||||||
),
|
|
||||||
tcmDiagnosisLists(buildDateCountRequestPayload() as any),
|
|
||||||
tcmDiagnosisLists(buildDateCountRequestPayload({ has_appointment: 0 }) as any),
|
|
||||||
tcmDiagnosisLists(
|
|
||||||
buildDateCountRequestPayload({ completed_appointment: 1, has_appointment: '' }) as any
|
|
||||||
),
|
|
||||||
tcmDiagnosisLists(buildPendingAssignCountPayload() as any)
|
tcmDiagnosisLists(buildPendingAssignCountPayload() as any)
|
||||||
])
|
])
|
||||||
dateCounts.value = {
|
dateCounts.value = {
|
||||||
@@ -1200,11 +1135,6 @@ const clearLatestAppointmentFilters = () => {
|
|||||||
formData.latest_appointment_channel_source = ''
|
formData.latest_appointment_channel_source = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
const clearLatestAssignFilters = () => {
|
|
||||||
formData.latest_assign_start_date = ''
|
|
||||||
formData.latest_assign_end_date = ''
|
|
||||||
}
|
|
||||||
|
|
||||||
const hasLatestAppointmentFilter = () =>
|
const hasLatestAppointmentFilter = () =>
|
||||||
!!(
|
!!(
|
||||||
formData.latest_appointment_start_date ||
|
formData.latest_appointment_start_date ||
|
||||||
@@ -1212,9 +1142,6 @@ const hasLatestAppointmentFilter = () =>
|
|||||||
formData.latest_appointment_channel_source
|
formData.latest_appointment_channel_source
|
||||||
)
|
)
|
||||||
|
|
||||||
const hasLatestAssignFilter = () =>
|
|
||||||
!!(formData.latest_assign_start_date || formData.latest_assign_end_date)
|
|
||||||
|
|
||||||
const handleLatestAppointmentFilterChange = () => {
|
const handleLatestAppointmentFilterChange = () => {
|
||||||
if (hasLatestAppointmentFilter()) {
|
if (hasLatestAppointmentFilter()) {
|
||||||
formData.appointment_date = ''
|
formData.appointment_date = ''
|
||||||
@@ -1227,27 +1154,6 @@ const handleLatestAppointmentFilterChange = () => {
|
|||||||
doSearch()
|
doSearch()
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleLatestAssignFilterChange = () => {
|
|
||||||
doSearch()
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleTableSortChange = ({
|
|
||||||
prop,
|
|
||||||
order
|
|
||||||
}: {
|
|
||||||
prop: string
|
|
||||||
order: 'ascending' | 'descending' | null
|
|
||||||
}) => {
|
|
||||||
if (prop === 'unserved_days') {
|
|
||||||
formData.sort_unserved_days =
|
|
||||||
order === 'ascending' ? 'asc' : order === 'descending' ? 'desc' : ''
|
|
||||||
} else {
|
|
||||||
formData.sort_unserved_days = ''
|
|
||||||
}
|
|
||||||
pager.page = 1
|
|
||||||
getLists()
|
|
||||||
}
|
|
||||||
|
|
||||||
const latestAppointmentChannelText = (row: any) => {
|
const latestAppointmentChannelText = (row: any) => {
|
||||||
const desc = String(row?.latest_appointment_channel_source_desc || '').trim()
|
const desc = String(row?.latest_appointment_channel_source_desc || '').trim()
|
||||||
const raw = String(row?.latest_appointment_channel_source || '').trim()
|
const raw = String(row?.latest_appointment_channel_source || '').trim()
|
||||||
@@ -1294,9 +1200,6 @@ const handleReset = () => {
|
|||||||
formData.latest_appointment_start_date = ''
|
formData.latest_appointment_start_date = ''
|
||||||
formData.latest_appointment_end_date = ''
|
formData.latest_appointment_end_date = ''
|
||||||
formData.latest_appointment_channel_source = ''
|
formData.latest_appointment_channel_source = ''
|
||||||
formData.latest_assign_start_date = ''
|
|
||||||
formData.latest_assign_end_date = ''
|
|
||||||
formData.sort_unserved_days = ''
|
|
||||||
formData.diagnosis_confirmed = ''
|
formData.diagnosis_confirmed = ''
|
||||||
formData.appointment_date = ''
|
formData.appointment_date = ''
|
||||||
formData.has_appointment = ''
|
formData.has_appointment = ''
|
||||||
@@ -2395,11 +2298,6 @@ onUnmounted(() => {
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.latest-assign-range {
|
|
||||||
width: 260px;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.latest-appointment-channel {
|
.latest-appointment-channel {
|
||||||
width: 170px;
|
width: 170px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
</span>
|
</span>
|
||||||
<div>
|
<div>
|
||||||
<div class="wb-section-name">订单统计</div>
|
<div class="wb-section-name">订单统计</div>
|
||||||
<div class="wb-section-sub">{{ orderStatsDateRangeText }} · {{ orderStatsData.order_type_name || '—' }}</div>
|
<div class="wb-section-sub">{{ orderStatsDateRangeText }} · {{ orderStatsData.order_type_name || '-' }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="wb-toolbar">
|
<div class="wb-toolbar">
|
||||||
@@ -821,8 +821,8 @@ onMounted(() => {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.workbench-page {
|
.workbench-page {
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
padding: 20px 20px 40px;
|
padding: 4px 0 24px;
|
||||||
background: linear-gradient(160deg, #eef2ff 0%, #f8fafc 38%, #f1f5f9 100%);
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-hero {
|
.wb-hero {
|
||||||
@@ -830,56 +830,86 @@ onMounted(() => {
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
gap: 16px;
|
gap: 20px;
|
||||||
margin-bottom: 22px;
|
margin-bottom: 24px;
|
||||||
padding: 22px 26px;
|
padding: 28px 28px;
|
||||||
border-radius: 20px;
|
border-radius: var(--admin-radius-xl);
|
||||||
background: linear-gradient(135deg, rgba(255, 255, 255, 0.92) 0%, rgba(255, 255, 255, 0.65) 100%);
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
border: 1px solid rgba(255, 255, 255, 0.95);
|
background: var(--admin-surface-glass);
|
||||||
box-shadow: 0 12px 40px rgba(15, 23, 42, 0.06);
|
backdrop-filter: blur(16px);
|
||||||
|
box-shadow: var(--el-box-shadow-light);
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background:
|
||||||
|
linear-gradient(120deg, rgba(6, 182, 212, 0.14) 0%, transparent 45%),
|
||||||
|
linear-gradient(300deg, rgba(16, 185, 129, 0.1) 0%, transparent 40%);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: 0 0 auto;
|
||||||
|
height: 3px;
|
||||||
|
background: var(--admin-brand-gradient);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.wb-hero-text {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-hero-title {
|
.wb-hero-title {
|
||||||
margin: 0 0 6px;
|
margin: 0 0 8px;
|
||||||
font-size: 26px;
|
font-size: 28px;
|
||||||
font-weight: 700;
|
font-weight: 800;
|
||||||
letter-spacing: 0.02em;
|
letter-spacing: -0.03em;
|
||||||
color: #0f172a;
|
background: var(--admin-brand-gradient);
|
||||||
|
background-clip: text;
|
||||||
|
-webkit-background-clip: text;
|
||||||
|
-webkit-text-fill-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-hero-desc {
|
.wb-hero-desc {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-size: 14px;
|
font-size: 15px;
|
||||||
color: #64748b;
|
color: var(--el-text-color-secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-refresh-btn {
|
.wb-refresh-btn {
|
||||||
box-shadow: 0 8px 20px rgba(59, 130, 246, 0.25);
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
box-shadow: var(--admin-brand-glow);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section {
|
.wb-section {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
border-radius: 20px;
|
border-radius: var(--admin-radius-xl);
|
||||||
background: rgba(255, 255, 255, 0.88);
|
background: var(--admin-surface-elevated);
|
||||||
border: 1px solid rgba(255, 255, 255, 0.9);
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
box-shadow: 0 8px 32px rgba(15, 23, 42, 0.05);
|
box-shadow: var(--el-box-shadow);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
backdrop-filter: blur(10px);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section--diagnosis {
|
.wb-section--diagnosis {
|
||||||
border-top: 3px solid transparent;
|
border-top: 3px solid transparent;
|
||||||
border-image: linear-gradient(90deg, #3b82f6, #60a5fa) 1;
|
border-image: linear-gradient(90deg, #06b6d4, #10b981) 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section--order {
|
.wb-section--order {
|
||||||
border-top: 3px solid transparent;
|
border-top: 3px solid transparent;
|
||||||
border-image: linear-gradient(90deg, #8b5cf6, #a78bfa) 1;
|
border-image: linear-gradient(90deg, #0891b2, #6366f1) 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section--trend {
|
.wb-section--trend {
|
||||||
border-top: 3px solid transparent;
|
border-top: 3px solid transparent;
|
||||||
border-image: linear-gradient(90deg, #14b8a6, #2dd4bf) 1;
|
border-image: linear-gradient(90deg, #10b981, #06b6d4) 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-head {
|
.wb-section-head {
|
||||||
@@ -889,8 +919,8 @@ onMounted(() => {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
gap: 12px;
|
gap: 12px;
|
||||||
padding: 18px 22px;
|
padding: 18px 22px;
|
||||||
border-bottom: 1px solid rgba(226, 232, 240, 0.9);
|
border-bottom: 1px solid var(--el-border-color-extra-light);
|
||||||
background: linear-gradient(180deg, rgba(248, 250, 252, 0.9) 0%, rgba(255, 255, 255, 0) 100%);
|
background: var(--admin-brand-gradient-soft);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-title {
|
.wb-section-title {
|
||||||
@@ -903,38 +933,68 @@ onMounted(() => {
|
|||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: 44px;
|
width: 46px;
|
||||||
height: 44px;
|
height: 46px;
|
||||||
border-radius: 14px;
|
border-radius: 14px;
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-icon--blue {
|
.wb-section-icon--blue {
|
||||||
background: linear-gradient(135deg, #3b82f6, #2563eb);
|
background: var(--admin-brand-gradient);
|
||||||
box-shadow: 0 8px 20px rgba(37, 99, 235, 0.35);
|
box-shadow: var(--admin-brand-glow);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-icon--violet {
|
.wb-section-icon--violet {
|
||||||
background: linear-gradient(135deg, #8b5cf6, #7c3aed);
|
background: linear-gradient(135deg, #0891b2, #6366f1);
|
||||||
box-shadow: 0 8px 20px rgba(124, 58, 237, 0.3);
|
box-shadow: 0 8px 24px rgba(99, 102, 241, 0.25);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-icon--teal {
|
.wb-section-icon--teal {
|
||||||
background: linear-gradient(135deg, #14b8a6, #0d9488);
|
background: linear-gradient(135deg, #10b981, #06b6d4);
|
||||||
box-shadow: 0 8px 20px rgba(13, 148, 136, 0.3);
|
box-shadow: 0 8px 24px rgba(16, 185, 129, 0.25);
|
||||||
|
}
|
||||||
|
|
||||||
|
.wb-kpi--blue {
|
||||||
|
background: linear-gradient(145deg, rgba(6, 182, 212, 0.12), rgba(16, 185, 129, 0.06));
|
||||||
|
border: 1px solid rgba(6, 182, 212, 0.22);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
.wb-kpi--violet {
|
||||||
|
background: linear-gradient(145deg, rgba(99, 102, 241, 0.1), rgba(6, 182, 212, 0.06));
|
||||||
|
border: 1px solid rgba(99, 102, 241, 0.2);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
.wb-kpi--amber {
|
||||||
|
background: linear-gradient(145deg, rgba(245, 158, 11, 0.12), rgba(251, 191, 36, 0.06));
|
||||||
|
border: 1px solid rgba(245, 158, 11, 0.24);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
.wb-rank-strip {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 112px;
|
||||||
|
padding: 14px 18px;
|
||||||
|
border-radius: var(--admin-radius-lg);
|
||||||
|
background: var(--admin-brand-gradient-soft);
|
||||||
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-name {
|
.wb-section-name {
|
||||||
font-size: 17px;
|
font-size: 16px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: #0f172a;
|
color: var(--el-text-color-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-section-sub {
|
.wb-section-sub {
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: #94a3b8;
|
color: var(--el-text-color-secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-toolbar {
|
.wb-toolbar {
|
||||||
@@ -968,21 +1028,6 @@ onMounted(() => {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-kpi--blue {
|
|
||||||
background: linear-gradient(145deg, #eff6ff 0%, #dbeafe 100%);
|
|
||||||
border: 1px solid rgba(59, 130, 246, 0.2);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wb-kpi--violet {
|
|
||||||
background: linear-gradient(145deg, #f5f3ff 0%, #ede9fe 100%);
|
|
||||||
border: 1px solid rgba(139, 92, 246, 0.22);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wb-kpi--amber {
|
|
||||||
background: linear-gradient(145deg, #fffbeb 0%, #fef3c7 100%);
|
|
||||||
border: 1px solid rgba(245, 158, 11, 0.25);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wb-kpi-label {
|
.wb-kpi-label {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
color: #64748b;
|
color: #64748b;
|
||||||
@@ -1007,17 +1052,6 @@ onMounted(() => {
|
|||||||
color: #94a3b8;
|
color: #94a3b8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-rank-strip {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
min-height: 112px;
|
|
||||||
padding: 14px 18px;
|
|
||||||
border-radius: 16px;
|
|
||||||
background: #f8fafc;
|
|
||||||
border: 1px solid #e2e8f0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wb-rank-strip--compact {
|
.wb-rank-strip--compact {
|
||||||
min-height: 112px;
|
min-height: 112px;
|
||||||
}
|
}
|
||||||
@@ -1080,9 +1114,10 @@ onMounted(() => {
|
|||||||
.wb-chart-card {
|
.wb-chart-card {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 14px 16px 8px;
|
padding: 14px 16px 8px;
|
||||||
border-radius: 16px;
|
border-radius: var(--admin-radius-lg);
|
||||||
background: #fafbfc;
|
background: var(--admin-surface-elevated);
|
||||||
border: 1px solid #eef0f4;
|
border: 1px solid var(--el-border-color-lighter);
|
||||||
|
box-shadow: var(--el-box-shadow-lighter);
|
||||||
}
|
}
|
||||||
|
|
||||||
.wb-chart-card-head {
|
.wb-chart-card-head {
|
||||||
|
|||||||
@@ -77,7 +77,22 @@ module.exports = {
|
|||||||
mask: 'var(--el-mask-color)'
|
mask: 'var(--el-mask-color)'
|
||||||
},
|
},
|
||||||
fontFamily: {
|
fontFamily: {
|
||||||
sans: ['PingFang SC', 'Arial', 'Hiragino Sans GB', 'Microsoft YaHei', 'sans-serif']
|
sans: [
|
||||||
|
'PingFang SC',
|
||||||
|
'SF Pro Text',
|
||||||
|
'Segoe UI',
|
||||||
|
'Arial',
|
||||||
|
'Hiragino Sans GB',
|
||||||
|
'Microsoft YaHei',
|
||||||
|
'sans-serif'
|
||||||
|
]
|
||||||
|
},
|
||||||
|
borderRadius: {
|
||||||
|
sm: 'var(--admin-radius-sm)',
|
||||||
|
DEFAULT: 'var(--admin-radius-md)',
|
||||||
|
md: 'var(--admin-radius-md)',
|
||||||
|
lg: 'var(--admin-radius-lg)',
|
||||||
|
xl: 'var(--admin-radius-xl)'
|
||||||
},
|
},
|
||||||
boxShadow: {
|
boxShadow: {
|
||||||
DEFAULT: 'var(--el-box-shadow)',
|
DEFAULT: 'var(--el-box-shadow)',
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1,44 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace app\adminapi\controller\stats;
|
|
||||||
|
|
||||||
use app\adminapi\controller\BaseAdminController;
|
|
||||||
use app\adminapi\lists\stats\AutoAssignLogLists;
|
|
||||||
use app\adminapi\logic\stats\AutoAssignLogLogic;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 待分配诊单自动指派日志
|
|
||||||
*
|
|
||||||
* - GET stats.autoAssignLog/lists 日志列表
|
|
||||||
* - POST stats.autoAssignLog/rollback 批量回退已自动分配的医助
|
|
||||||
*/
|
|
||||||
class AutoAssignLogController extends BaseAdminController
|
|
||||||
{
|
|
||||||
public function lists()
|
|
||||||
{
|
|
||||||
return $this->dataLists(new AutoAssignLogLists());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function rollback()
|
|
||||||
{
|
|
||||||
$ids = $this->request->post('ids', []);
|
|
||||||
if (!is_array($ids)) {
|
|
||||||
$ids = [$ids];
|
|
||||||
}
|
|
||||||
$result = AutoAssignLogLogic::rollback($ids, $this->adminId, $this->adminInfo);
|
|
||||||
if ($result === false) {
|
|
||||||
return $this->fail(AutoAssignLogLogic::getError());
|
|
||||||
}
|
|
||||||
|
|
||||||
$msg = sprintf('回退成功 %d 条', (int) ($result['success'] ?? 0));
|
|
||||||
$failed = (int) ($result['failed'] ?? 0);
|
|
||||||
if ($failed > 0) {
|
|
||||||
$msg .= sprintf('，跳过/失败 %d 条', $failed);
|
|
||||||
}
|
|
||||||
|
|
||||||
// show=0：由前端按 success/failed 明细提示，避免与部分失败警告重复
|
|
||||||
return $this->success($msg, $result, 1, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -94,24 +94,6 @@ class DiagnosisController extends BaseAdminController
|
|||||||
return $this->fail(DiagnosisLogic::getError());
|
return $this->fail(DiagnosisLogic::getError());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 设置复诊接诊率统计起始偏移（业务订单 tab）
|
|
||||||
*/
|
|
||||||
public function setRevisitSlotStartOffset()
|
|
||||||
{
|
|
||||||
$params = (new DiagnosisValidate())->post()->goCheck('setRevisitSlotStartOffset');
|
|
||||||
$ok = DiagnosisLogic::setRevisitSlotStartOffset(
|
|
||||||
(int) $params['id'],
|
|
||||||
(int) $params['revisit_slot_start_offset'],
|
|
||||||
$this->adminInfo
|
|
||||||
);
|
|
||||||
if (!$ok) {
|
|
||||||
return $this->fail(DiagnosisLogic::getError());
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->success('保存成功');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @notes 删除诊单
|
* @notes 删除诊单
|
||||||
* @return \think\response\Json
|
* @return \think\response\Json
|
||||||
|
|||||||
@@ -181,20 +181,6 @@ class PrescriptionOrderController extends BaseAdminController
|
|||||||
return $this->success('保存成功');
|
return $this->success('保存成功');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改关联处方服用参数（主方/辅方次数与开立天数）及订单服用天数
|
|
||||||
*/
|
|
||||||
public function patchPrescriptionUsage()
|
|
||||||
{
|
|
||||||
$params = (new PrescriptionOrderValidate())->post()->goCheck('patchPrescriptionUsage');
|
|
||||||
$ok = PrescriptionOrderLogic::patchPrescriptionUsage($params, $this->adminId, $this->adminInfo);
|
|
||||||
if (!$ok) {
|
|
||||||
return $this->fail(PrescriptionOrderLogic::getError());
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->success('保存成功');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function auditPrescription()
|
public function auditPrescription()
|
||||||
{
|
{
|
||||||
$params = (new PrescriptionOrderValidate())->post()->goCheck('auditPrescription');
|
$params = (new PrescriptionOrderValidate())->post()->goCheck('auditPrescription');
|
||||||
@@ -342,20 +328,6 @@ class PrescriptionOrderController extends BaseAdminController
|
|||||||
return $this->success('', $result);
|
return $this->success('', $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 手工新增操作日志（可选同步调整处方/支付单审核状态）
|
|
||||||
*/
|
|
||||||
public function addLog()
|
|
||||||
{
|
|
||||||
$params = (new PrescriptionOrderValidate())->post()->goCheck('addLog');
|
|
||||||
$result = PrescriptionOrderLogic::addLog($params, $this->adminId, $this->adminInfo);
|
|
||||||
if ($result === false) {
|
|
||||||
return $this->fail(PrescriptionOrderLogic::getError());
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->success('日志已添加', $result);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 为「已发货」订单新增一条关联支付单，并重置支付单审核状态为待审核
|
* 为「已发货」订单新增一条关联支付单，并重置支付单审核状态为待审核
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -3,8 +3,6 @@
|
|||||||
namespace app\adminapi\lists\doctor;
|
namespace app\adminapi\lists\doctor;
|
||||||
|
|
||||||
use app\adminapi\lists\BaseAdminDataLists;
|
use app\adminapi\lists\BaseAdminDataLists;
|
||||||
use app\adminapi\logic\dept\DeptLogic;
|
|
||||||
use app\common\model\auth\AdminDept;
|
|
||||||
use app\common\model\DiagnosisViewRecord;
|
use app\common\model\DiagnosisViewRecord;
|
||||||
use app\common\model\doctor\Appointment;
|
use app\common\model\doctor\Appointment;
|
||||||
use app\common\model\tcm\Prescription;
|
use app\common\model\tcm\Prescription;
|
||||||
@@ -77,35 +75,6 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 按部门筛选：接诊医生、诊单医助或挂号医助所属部门命中子树即可（选父级含子级）
|
|
||||||
*
|
|
||||||
* @param mixed $query
|
|
||||||
*/
|
|
||||||
private function applyAssistantDeptIdFilter($query): void
|
|
||||||
{
|
|
||||||
if (!isset($this->params['assistant_dept_id']) || $this->params['assistant_dept_id'] === '' || (int) $this->params['assistant_dept_id'] <= 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$rootDeptId = (int) $this->params['assistant_dept_id'];
|
|
||||||
$deptIds = DeptLogic::getSelfAndDescendantIds($rootDeptId);
|
|
||||||
$deptIds = array_values(array_filter(array_map('intval', $deptIds), static function (int $id): bool {
|
|
||||||
return $id > 0;
|
|
||||||
}));
|
|
||||||
if ($deptIds === []) {
|
|
||||||
$query->whereRaw('0 = 1');
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$inList = implode(',', $deptIds);
|
|
||||||
$adTbl = (new AdminDept())->getTable();
|
|
||||||
$query->whereRaw(
|
|
||||||
"(EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = a.`doctor_id` AND ad.`dept_id` IN ({$inList}))"
|
|
||||||
. " OR EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = u.`assistant_id` AND ad.`dept_id` IN ({$inList}))"
|
|
||||||
. " OR EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = a.`assistant_id` AND ad.`dept_id` IN ({$inList})))"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 渠道筛选：与 AppointmentLogic 一致，兼容仅有 channel_source、仅有 channels、或两者皆有的表结构
|
* 渠道筛选：与 AppointmentLogic 一致，兼容仅有 channel_source、仅有 channels、或两者皆有的表结构
|
||||||
*
|
*
|
||||||
@@ -222,8 +191,6 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
|
|||||||
|
|
||||||
$this->applyAssistantIdFilter($query);
|
$this->applyAssistantIdFilter($query);
|
||||||
|
|
||||||
$this->applyAssistantDeptIdFilter($query);
|
|
||||||
|
|
||||||
$this->applyChannelSourceFilter($query, $chFilter);
|
$this->applyChannelSourceFilter($query, $chFilter);
|
||||||
|
|
||||||
// 是否确认诊单：1=已确认 0=未确认
|
// 是否确认诊单：1=已确认 0=未确认
|
||||||
@@ -406,8 +373,6 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
|
|||||||
|
|
||||||
$this->applyAssistantIdFilter($query);
|
$this->applyAssistantIdFilter($query);
|
||||||
|
|
||||||
$this->applyAssistantDeptIdFilter($query);
|
|
||||||
|
|
||||||
$this->applyChannelSourceFilter($query, $chFilter);
|
$this->applyChannelSourceFilter($query, $chFilter);
|
||||||
|
|
||||||
if ((int) ($this->params['exclude_cancelled'] ?? 0) === 1) {
|
if ((int) ($this->params['exclude_cancelled'] ?? 0) === 1) {
|
||||||
|
|||||||
@@ -1,147 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace app\adminapi\lists\stats;
|
|
||||||
|
|
||||||
use app\adminapi\lists\BaseAdminDataLists;
|
|
||||||
use app\common\lists\ListsSearchInterface;
|
|
||||||
use think\facade\Db;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 待分配诊单自动指派日志列表
|
|
||||||
*
|
|
||||||
* 数据来源：tcm_diagnosis_auto_assign_log（定时命令 tcm:auto-assign-pending 写入）
|
|
||||||
* 筛选：run_date / create_time 区间 / action / keyword / rollback 状态
|
|
||||||
*/
|
|
||||||
class AutoAssignLogLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
||||||
{
|
|
||||||
private const TIER_LABELS = [
|
|
||||||
'gt70' => '>70%',
|
|
||||||
'60_70' => '60%~70%',
|
|
||||||
'50_60' => '50%~60%',
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 设置搜索条件
|
|
||||||
*/
|
|
||||||
public function setSearch(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'=' => ['run_date', 'action', 'assistant_id', 'batch_no', 'stat_month'],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 获取列表
|
|
||||||
*/
|
|
||||||
public function lists(): array
|
|
||||||
{
|
|
||||||
$rows = $this->buildQuery()
|
|
||||||
->order(['id' => 'desc'])
|
|
||||||
->limit($this->limitOffset, $this->limitLength)
|
|
||||||
->select()
|
|
||||||
->toArray();
|
|
||||||
|
|
||||||
foreach ($rows as &$row) {
|
|
||||||
$ct = (int) ($row['create_time'] ?? 0);
|
|
||||||
$row['create_time_text'] = $ct > 0 ? date('Y-m-d H:i:s', $ct) : '';
|
|
||||||
$row['action_text'] = (int) ($row['action'] ?? 0) === 1 ? '已分配' : '未分配';
|
|
||||||
$row['tier_text'] = self::TIER_LABELS[(string) ($row['tier'] ?? '')] ?? '';
|
|
||||||
$row['visit2_rate'] = $row['visit2_rate'] !== null ? (float) $row['visit2_rate'] : null;
|
|
||||||
|
|
||||||
$rbTs = (int) ($row['rollback_time'] ?? 0);
|
|
||||||
$row['rollback_time_text'] = $rbTs > 0 ? date('Y-m-d H:i:s', $rbTs) : '';
|
|
||||||
$row['is_rollback'] = $rbTs > 0 ? 1 : 0;
|
|
||||||
$row['can_rollback'] = ((int) ($row['action'] ?? 0) === 1 && $rbTs === 0) ? 1 : 0;
|
|
||||||
if ($rbTs > 0) {
|
|
||||||
$row['rollback_status_text'] = '已回退'
|
|
||||||
. (($row['rollback_admin_name'] ?? '') !== '' ? (' · ' . $row['rollback_admin_name']) : '');
|
|
||||||
} else {
|
|
||||||
$row['rollback_status_text'] = ((int) ($row['action'] ?? 0) === 1) ? '可回退' : '—';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($row);
|
|
||||||
|
|
||||||
return $rows;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 获取数量
|
|
||||||
*/
|
|
||||||
public function count(): int
|
|
||||||
{
|
|
||||||
return $this->buildQuery()->count();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return \think\db\Query
|
|
||||||
*/
|
|
||||||
private function buildQuery()
|
|
||||||
{
|
|
||||||
$query = Db::name('tcm_diagnosis_auto_assign_log')->where($this->searchWhere);
|
|
||||||
|
|
||||||
$keyword = trim((string) ($this->params['keyword'] ?? ''));
|
|
||||||
if ($keyword !== '') {
|
|
||||||
$query->where(function ($q) use ($keyword) {
|
|
||||||
$q->whereLike('patient_name', '%' . $keyword . '%')
|
|
||||||
->whereOr('patient_phone', 'like', '%' . $keyword . '%')
|
|
||||||
->whereOr('assistant_name', 'like', '%' . $keyword . '%');
|
|
||||||
if (preg_match('/^\d+$/', $keyword) === 1 && (int) $keyword > 0) {
|
|
||||||
$q->whereOr('diagnosis_id', '=', (int) $keyword);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
$startDate = trim((string) ($this->params['start_date'] ?? ''));
|
|
||||||
if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $startDate) === 1) {
|
|
||||||
$query->where('run_date', '>=', $startDate);
|
|
||||||
}
|
|
||||||
$endDate = trim((string) ($this->params['end_date'] ?? ''));
|
|
||||||
if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $endDate) === 1) {
|
|
||||||
$query->where('run_date', '<=', $endDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 记录时间（create_time）区间：支持 Y-m-d 或 Y-m-d H:i:s
|
|
||||||
$startTs = $this->parseTimeParam((string) ($this->params['start_time'] ?? ''), false);
|
|
||||||
if ($startTs > 0) {
|
|
||||||
$query->where('create_time', '>=', $startTs);
|
|
||||||
}
|
|
||||||
$endTs = $this->parseTimeParam((string) ($this->params['end_time'] ?? ''), true);
|
|
||||||
if ($endTs > 0) {
|
|
||||||
$query->where('create_time', '<=', $endTs);
|
|
||||||
}
|
|
||||||
|
|
||||||
$rollback = trim((string) ($this->params['is_rollback'] ?? ''));
|
|
||||||
if ($rollback === '1') {
|
|
||||||
$query->where('rollback_time', '>', 0);
|
|
||||||
} elseif ($rollback === '0') {
|
|
||||||
$query->where('rollback_time', '=', 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $query;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param bool $endOfDay 仅日期时是否取当天结束
|
|
||||||
*/
|
|
||||||
private function parseTimeParam(string $raw, bool $endOfDay): int
|
|
||||||
{
|
|
||||||
$raw = trim($raw);
|
|
||||||
if ($raw === '') {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $raw) === 1) {
|
|
||||||
return (int) strtotime($raw . ($endOfDay ? ' 23:59:59' : ' 00:00:00'));
|
|
||||||
}
|
|
||||||
if (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/', $raw) === 1) {
|
|
||||||
if (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/', $raw) === 1) {
|
|
||||||
$raw .= $endOfDay ? ':59' : ':00';
|
|
||||||
}
|
|
||||||
|
|
||||||
return (int) strtotime($raw);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -140,7 +140,6 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->applyLatestAppointmentFilters($query, $pendingWideSearch);
|
$this->applyLatestAppointmentFilters($query, $pendingWideSearch);
|
||||||
$this->applyLatestAssignFilters($query, $pendingWideSearch);
|
|
||||||
|
|
||||||
$this->applyPendingAssignBusinessOrderMonthFilter($query);
|
$this->applyPendingAssignBusinessOrderMonthFilter($query);
|
||||||
|
|
||||||
@@ -168,7 +167,30 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$orderRaw = $this->resolveListOrderRaw($pendingWideSearch);
|
// 按挂号状态优先级排序：已过号(4) > 已预约(1) > 已完成(3)，然后按挂号日期+时间升序
|
||||||
|
// 若传了 appointment_date（当天/明天等筛选），只按「该日」的挂号排序与展示
|
||||||
|
$diagTbl = (new Diagnosis())->getTable();
|
||||||
|
$aptTbl = (new Appointment())->getTable();
|
||||||
|
$minAptDateCond = '';
|
||||||
|
if (!$pendingWideSearch && !empty($this->params['appointment_date'])) {
|
||||||
|
$sortAptDate = addslashes((string) $this->params['appointment_date']);
|
||||||
|
$minAptDateCond = " AND apt.appointment_date = '{$sortAptDate}'";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取最早的挂号状态（用于排序优先级）
|
||||||
|
$minAptStatusExpr = '(SELECT apt.status FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ' ORDER BY CASE apt.status WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END, apt.appointment_date ASC, apt.appointment_time ASC LIMIT 1)';
|
||||||
|
|
||||||
|
// 获取最早的挂号时间（用于同状态内排序）
|
||||||
|
$minAptExpr = '(SELECT MIN(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ')';
|
||||||
|
|
||||||
|
// 「已完成」Tab：按最近一条「已完成」(status=3) 挂号日期+时间降序…
|
||||||
|
$isCompletedTab = !$pendingWideSearch && isset($this->params['completed_appointment']) && (string) $this->params['completed_appointment'] === '1';
|
||||||
|
if ($isCompletedTab) {
|
||||||
|
$maxCompletedAptExpr = '(SELECT MAX(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status = 3' . $minAptDateCond . ')';
|
||||||
|
$orderRaw = $diagTbl . '.assign_read_at IS NULL DESC, IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC";
|
||||||
|
} else {
|
||||||
|
$orderRaw = $diagTbl . '.assign_read_at IS NULL DESC, CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC";
|
||||||
|
}
|
||||||
|
|
||||||
$lists = $query
|
$lists = $query
|
||||||
->with(['DiagnosisViewRecord'])
|
->with(['DiagnosisViewRecord'])
|
||||||
@@ -549,7 +571,6 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->applyLatestAppointmentFilters($query, $pendingWideSearch);
|
$this->applyLatestAppointmentFilters($query, $pendingWideSearch);
|
||||||
$this->applyLatestAssignFilters($query, $pendingWideSearch);
|
|
||||||
|
|
||||||
// 仅已开方（待分配+关键词检索时不限制）
|
// 仅已开方（待分配+关键词检索时不限制）
|
||||||
if (!$pendingWideSearch && isset($this->params['only_has_prescription']) && (string) $this->params['only_has_prescription'] === '1') {
|
if (!$pendingWideSearch && isset($this->params['only_has_prescription']) && (string) $this->params['only_has_prescription'] === '1') {
|
||||||
@@ -623,99 +644,6 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||||||
$query->whereExists("SELECT 1 FROM {$aptTbl} latest_apt WHERE " . implode(' AND ', $conditions));
|
$query->whereExists("SELECT 1 FROM {$aptTbl} latest_apt WHERE " . implode(' AND ', $conditions));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 最近一次成功指派过滤：按 create_time DESC, id DESC 取 to_assistant_id>0 的一条。
|
|
||||||
*
|
|
||||||
* @param mixed $query
|
|
||||||
*/
|
|
||||||
private function applyLatestAssignFilters($query, bool $pendingWideSearch): void
|
|
||||||
{
|
|
||||||
if ($pendingWideSearch) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$startDate = $this->normalizeYmd($this->params['latest_assign_start_date'] ?? '');
|
|
||||||
$endDate = $this->normalizeYmd($this->params['latest_assign_end_date'] ?? '');
|
|
||||||
if ($startDate === '' && $endDate === '') {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$logTbl = Db::name('tcm_diagnosis_assign_log')->getTable();
|
|
||||||
$diagTbl = (new Diagnosis())->getTable();
|
|
||||||
$latestIdSql = $this->latestAssignLogIdSubSql($logTbl, $diagTbl);
|
|
||||||
$conditions = ["latest_lg.id = ({$latestIdSql})"];
|
|
||||||
|
|
||||||
if ($startDate !== '') {
|
|
||||||
$startTs = (int) strtotime($startDate . ' 00:00:00');
|
|
||||||
$conditions[] = "latest_lg.create_time >= {$startTs}";
|
|
||||||
}
|
|
||||||
if ($endDate !== '') {
|
|
||||||
$endTs = (int) strtotime($endDate . ' 23:59:59');
|
|
||||||
$conditions[] = "latest_lg.create_time <= {$endTs}";
|
|
||||||
}
|
|
||||||
|
|
||||||
$query->whereExists("SELECT 1 FROM {$logTbl} latest_lg WHERE " . implode(' AND ', $conditions));
|
|
||||||
}
|
|
||||||
|
|
||||||
private function latestAssignLogIdSubSql(string $logTbl, string $diagTbl): string
|
|
||||||
{
|
|
||||||
return "SELECT lg_latest.id FROM {$logTbl} lg_latest "
|
|
||||||
. "WHERE lg_latest.diagnosis_id = {$diagTbl}.id "
|
|
||||||
. 'AND lg_latest.to_assistant_id > 0 '
|
|
||||||
. 'ORDER BY lg_latest.create_time DESC, lg_latest.id DESC LIMIT 1';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 列表默认排序；支持 sort_unserved_days=asc|desc 按未服务天数排序。
|
|
||||||
*/
|
|
||||||
private function resolveListOrderRaw(bool $pendingWideSearch): string
|
|
||||||
{
|
|
||||||
$diagTbl = (new Diagnosis())->getTable();
|
|
||||||
$sortUnserved = strtolower(trim((string) ($this->params['sort_unserved_days'] ?? '')));
|
|
||||||
if (in_array($sortUnserved, ['asc', 'desc'], true)) {
|
|
||||||
$anchorExpr = $this->unservedAnchorExpr($diagTbl);
|
|
||||||
$nullLast = "CASE WHEN IFNULL({$anchorExpr}, 0) = 0 THEN 1 ELSE 0 END ASC";
|
|
||||||
if ($sortUnserved === 'desc') {
|
|
||||||
return "{$nullLast}, IFNULL({$anchorExpr}, 0) ASC, {$diagTbl}.id DESC";
|
|
||||||
}
|
|
||||||
|
|
||||||
return "{$nullLast}, IFNULL({$anchorExpr}, 0) DESC, {$diagTbl}.id DESC";
|
|
||||||
}
|
|
||||||
|
|
||||||
$aptTbl = (new Appointment())->getTable();
|
|
||||||
$minAptDateCond = '';
|
|
||||||
if (!$pendingWideSearch && !empty($this->params['appointment_date'])) {
|
|
||||||
$sortAptDate = addslashes((string) $this->params['appointment_date']);
|
|
||||||
$minAptDateCond = " AND apt.appointment_date = '{$sortAptDate}'";
|
|
||||||
}
|
|
||||||
|
|
||||||
$minAptStatusExpr = '(SELECT apt.status FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ' ORDER BY CASE apt.status WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END, apt.appointment_date ASC, apt.appointment_time ASC LIMIT 1)';
|
|
||||||
$minAptExpr = '(SELECT MIN(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ')';
|
|
||||||
|
|
||||||
$isCompletedTab = !$pendingWideSearch && isset($this->params['completed_appointment']) && (string) $this->params['completed_appointment'] === '1';
|
|
||||||
if ($isCompletedTab) {
|
|
||||||
$maxCompletedAptExpr = '(SELECT MAX(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status = 3' . $minAptDateCond . ')';
|
|
||||||
|
|
||||||
return $diagTbl . '.assign_read_at IS NULL DESC, IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC";
|
|
||||||
}
|
|
||||||
|
|
||||||
return $diagTbl . '.assign_read_at IS NULL DESC, CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC";
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 未服务天数锚点：血糖/饮食/运动记录最近 record_date 的最大值 */
|
|
||||||
private function unservedAnchorExpr(string $diagTbl): string
|
|
||||||
{
|
|
||||||
$bloodTbl = (new BloodRecord())->getTable();
|
|
||||||
$dietTbl = (new DietRecord())->getTable();
|
|
||||||
$exerciseTbl = (new ExerciseRecord())->getTable();
|
|
||||||
|
|
||||||
return 'GREATEST('
|
|
||||||
. "COALESCE((SELECT MAX(br.record_date) FROM {$bloodTbl} br WHERE br.diagnosis_id = {$diagTbl}.id AND br.delete_time IS NULL), 0), "
|
|
||||||
. "COALESCE((SELECT MAX(dr.record_date) FROM {$dietTbl} dr WHERE dr.diagnosis_id = {$diagTbl}.id AND dr.delete_time IS NULL), 0), "
|
|
||||||
. "COALESCE((SELECT MAX(er.record_date) FROM {$exerciseTbl} er WHERE er.diagnosis_id = {$diagTbl}.id AND er.delete_time IS NULL), 0)"
|
|
||||||
. ')';
|
|
||||||
}
|
|
||||||
|
|
||||||
private function latestAppointmentIdSubSql(string $aptTbl, string $diagTbl): string
|
private function latestAppointmentIdSubSql(string $aptTbl, string $diagTbl): string
|
||||||
{
|
{
|
||||||
$statuses = implode(',', self::EFFECTIVE_APPOINTMENT_STATUSES);
|
$statuses = implode(',', self::EFFECTIVE_APPOINTMENT_STATUSES);
|
||||||
|
|||||||
@@ -741,10 +741,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
}
|
}
|
||||||
unset($item);
|
unset($item);
|
||||||
|
|
||||||
if ($this->shouldBypassListVisibilityForDiagnosisEdit()) {
|
|
||||||
$this->appendDiagnosisEditVisitSeqFields($lists);
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->appendPrescriptionOrderAssignSnapshotErCenterFlags($lists);
|
$this->appendPrescriptionOrderAssignSnapshotErCenterFlags($lists);
|
||||||
|
|
||||||
if ((int) ($this->params['yeji_order_drawer'] ?? 0) === 1) {
|
if ((int) ($this->params['yeji_order_drawer'] ?? 0) === 1) {
|
||||||
@@ -824,11 +820,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
'export_guahao_channel_source' => '自媒体渠道（挂号渠道来源）',
|
'export_guahao_channel_source' => '自媒体渠道（挂号渠道来源）',
|
||||||
'export_medication_form' => '药品形态',
|
'export_medication_form' => '药品形态',
|
||||||
'export_prescription_name' => '药方名称',
|
'export_prescription_name' => '药方名称',
|
||||||
'export_prescription_herbs' => '处方',
|
|
||||||
'export_main_usage' => '主方服用方式',
|
|
||||||
'export_main_usage_days' => '主方天数',
|
|
||||||
'export_aux_usage' => '辅方服用方式',
|
|
||||||
'export_aux_usage_days' => '辅方天数',
|
|
||||||
'export_service_package' => '服务套餐',
|
'export_service_package' => '服务套餐',
|
||||||
'export_medication_days' => '天数',
|
'export_medication_days' => '天数',
|
||||||
'export_amount' => '总金额',
|
'export_amount' => '总金额',
|
||||||
@@ -918,9 +909,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
$wrapWideKeys = [
|
$wrapWideKeys = [
|
||||||
'export_linked_pay_records',
|
'export_linked_pay_records',
|
||||||
'export_prescription_name',
|
'export_prescription_name',
|
||||||
'export_prescription_herbs',
|
|
||||||
'export_main_usage',
|
|
||||||
'export_aux_usage',
|
|
||||||
'export_guahao_channel_source',
|
'export_guahao_channel_source',
|
||||||
'export_assistant_dept',
|
'export_assistant_dept',
|
||||||
'export_service_package',
|
'export_service_package',
|
||||||
@@ -931,8 +919,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
'export_patient_gender' => 6,
|
'export_patient_gender' => 6,
|
||||||
'export_patient_age' => 6,
|
'export_patient_age' => 6,
|
||||||
'export_medication_days' => 6,
|
'export_medication_days' => 6,
|
||||||
'export_main_usage_days' => 8,
|
|
||||||
'export_aux_usage_days' => 8,
|
|
||||||
'export_amount' => 10,
|
'export_amount' => 10,
|
||||||
'export_paid_amount' => 10,
|
'export_paid_amount' => 10,
|
||||||
'export_refund_amount' => 10,
|
'export_refund_amount' => 10,
|
||||||
@@ -941,9 +927,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
'export_supply_mode' => 10,
|
'export_supply_mode' => 10,
|
||||||
'export_linked_pay_records' => 52,
|
'export_linked_pay_records' => 52,
|
||||||
'export_prescription_name' => 34,
|
'export_prescription_name' => 34,
|
||||||
'export_prescription_herbs' => 36,
|
|
||||||
'export_main_usage' => 28,
|
|
||||||
'export_aux_usage' => 28,
|
|
||||||
'export_guahao_channel_source' => 22,
|
'export_guahao_channel_source' => 22,
|
||||||
'export_assistant_dept' => 24,
|
'export_assistant_dept' => 24,
|
||||||
'export_service_package' => 18,
|
'export_service_package' => 18,
|
||||||
@@ -1421,69 +1404,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 诊单编辑-业务订单 tab：标注全局诊次及是否计入复诊接诊率（与 RevisitRateLogic 同口径）
|
|
||||||
*
|
|
||||||
* @param array<int, array<string, mixed>> $lists
|
|
||||||
*/
|
|
||||||
private function appendDiagnosisEditVisitSeqFields(array &$lists): void
|
|
||||||
{
|
|
||||||
if ($lists === []) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$diagIds = [];
|
|
||||||
foreach ($lists as $row) {
|
|
||||||
$d = (int) ($row['diagnosis_id'] ?? 0);
|
|
||||||
if ($d > 0) {
|
|
||||||
$diagIds[$d] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$contextDid = (int) ($this->params['context_diagnosis_id'] ?? 0);
|
|
||||||
if ($contextDid > 0) {
|
|
||||||
$diagIds[$contextDid] = true;
|
|
||||||
}
|
|
||||||
$diagIdList = array_keys($diagIds);
|
|
||||||
if ($diagIdList === []) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$offsetRows = Diagnosis::whereIn('id', $diagIdList)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->column('revisit_slot_start_offset', 'id');
|
|
||||||
$offsetMap = [];
|
|
||||||
foreach ($offsetRows as $id => $offset) {
|
|
||||||
$offsetMap[(int) $id] = max(0, min(20, (int) $offset));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @var array<int, int> $seqByOrderId order_id => global seq within diagnosis */
|
|
||||||
$seqByOrderId = [];
|
|
||||||
foreach ($diagIdList as $did) {
|
|
||||||
$q = PrescriptionOrder::where('diagnosis_id', $did)->whereNull('delete_time');
|
|
||||||
YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, '');
|
|
||||||
$orderIds = $q
|
|
||||||
->order(['create_time' => 'asc', 'id' => 'asc'])
|
|
||||||
->column('id');
|
|
||||||
$seq = 0;
|
|
||||||
foreach ($orderIds as $oid) {
|
|
||||||
$seq++;
|
|
||||||
$seqByOrderId[(int) $oid] = $seq;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($lists as &$row) {
|
|
||||||
$oid = (int) ($row['id'] ?? 0);
|
|
||||||
$did = (int) ($row['diagnosis_id'] ?? 0);
|
|
||||||
$seq = (int) ($seqByOrderId[$oid] ?? 0);
|
|
||||||
$offset = (int) ($offsetMap[$did] ?? 0);
|
|
||||||
$effectiveSlot = $seq > 0 ? $seq + $offset : 0;
|
|
||||||
$row['global_visit_seq'] = $effectiveSlot > 0 ? $effectiveSlot : null;
|
|
||||||
$row['raw_visit_seq'] = $seq > 0 ? $seq : null;
|
|
||||||
$row['counts_for_revisit_rate'] = $effectiveSlot >= 2 ? 1 : 0;
|
|
||||||
}
|
|
||||||
unset($row);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 列表行标注：指派日志快照（related_po_creator_id + related_po_create_time）是否指向本业务单，
|
* 列表行标注：指派日志快照（related_po_creator_id + related_po_create_time）是否指向本业务单，
|
||||||
* 以及该次操作的新医助（to_assistant_id）是否归属「二中心」部门子树（与 DeptLogic / 业绩看板一致）。
|
* 以及该次操作的新医助（to_assistant_id）是否归属「二中心」部门子树（与 DeptLogic / 业绩看板一致）。
|
||||||
|
|||||||
@@ -151,24 +151,6 @@ class DeptLogic extends BaseLogic
|
|||||||
* @return list<int>
|
* @return list<int>
|
||||||
*/
|
*/
|
||||||
private static function findErCenterRootDeptIds(): array
|
private static function findErCenterRootDeptIds(): array
|
||||||
{
|
|
||||||
return self::findCenterRootDeptIdsByNameKeyword('二中心');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 名称含「一中心」的部门 id。
|
|
||||||
*
|
|
||||||
* @return list<int>
|
|
||||||
*/
|
|
||||||
private static function findYiCenterRootDeptIds(): array
|
|
||||||
{
|
|
||||||
return self::findCenterRootDeptIdsByNameKeyword('一中心');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return list<int>
|
|
||||||
*/
|
|
||||||
private static function findCenterRootDeptIdsByNameKeyword(string $keyword): array
|
|
||||||
{
|
{
|
||||||
$rows = Dept::whereNull('delete_time')
|
$rows = Dept::whereNull('delete_time')
|
||||||
->field(['id', 'name'])
|
->field(['id', 'name'])
|
||||||
@@ -177,7 +159,7 @@ class DeptLogic extends BaseLogic
|
|||||||
$out = [];
|
$out = [];
|
||||||
foreach ($rows as $r) {
|
foreach ($rows as $r) {
|
||||||
$name = (string) ($r['name'] ?? '');
|
$name = (string) ($r['name'] ?? '');
|
||||||
if ($name !== '' && mb_strpos($name, $keyword) !== false) {
|
if ($name !== '' && mb_strpos($name, '二中心') !== false) {
|
||||||
$out[] = (int) $r['id'];
|
$out[] = (int) $r['id'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -219,19 +201,6 @@ class DeptLogic extends BaseLogic
|
|||||||
return array_fill_keys($subtreeIds, true);
|
return array_fill_keys($subtreeIds, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 名称含「一中心」的部门及其全部下级 id（map）。
|
|
||||||
*
|
|
||||||
* @return array<int, true>
|
|
||||||
*/
|
|
||||||
public static function getYiCenterSubtreeDeptIdSet(): array
|
|
||||||
{
|
|
||||||
$yiRoots = self::findYiCenterRootDeptIds();
|
|
||||||
$subtreeIds = self::unionErCenterSubtreeDeptIds($yiRoots);
|
|
||||||
|
|
||||||
return array_fill_keys($subtreeIds, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 二中心复诊统计用的业务订单行（与 rollup 同源 SQL）。
|
* 二中心复诊统计用的业务订单行（与 rollup 同源 SQL）。
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,227 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace app\adminapi\logic\stats;
|
|
||||||
|
|
||||||
use app\common\logic\BaseLogic;
|
|
||||||
use think\facade\Db;
|
|
||||||
use think\facade\Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 待分配诊单自动指派日志：回退已自动分配的医助
|
|
||||||
*/
|
|
||||||
class AutoAssignLogLogic extends BaseLogic
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* 批量回退：将诊单医助撤回到自动分配前的原医助（指派日志 from_assistant_id），并标记自动分配日志已回退。
|
|
||||||
*
|
|
||||||
* @param list<int|string> $ids 自动分配日志 id
|
|
||||||
* @return array{success:int,failed:int,messages:list<string>}|false
|
|
||||||
*/
|
|
||||||
public static function rollback(array $ids, int $adminId, array $adminInfo = []): array|false
|
|
||||||
{
|
|
||||||
$idList = array_values(array_unique(array_filter(array_map('intval', $ids), static fn (int $id) => $id > 0)));
|
|
||||||
if ($idList === []) {
|
|
||||||
self::setError('请选择要回退的记录');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$adminName = (string) ($adminInfo['name'] ?? '');
|
|
||||||
$adminAccount = (string) ($adminInfo['account'] ?? '');
|
|
||||||
$req = request();
|
|
||||||
$ip = (string) ($req->ip() ?? '');
|
|
||||||
$now = time();
|
|
||||||
|
|
||||||
$success = 0;
|
|
||||||
$failed = 0;
|
|
||||||
$messages = [];
|
|
||||||
|
|
||||||
foreach ($idList as $logId) {
|
|
||||||
try {
|
|
||||||
$ret = self::rollbackOne($logId, $adminId, $adminName, $adminAccount, $ip, $now);
|
|
||||||
if ($ret === true) {
|
|
||||||
$success++;
|
|
||||||
} else {
|
|
||||||
$failed++;
|
|
||||||
$messages[] = (string) $ret;
|
|
||||||
}
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
$failed++;
|
|
||||||
$messages[] = sprintf('日志#%d：%s', $logId, $e->getMessage());
|
|
||||||
Log::warning('auto assign rollback failed: ' . $e->getMessage(), ['log_id' => $logId]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($success === 0 && $failed > 0) {
|
|
||||||
self::setError($messages[0] ?? '回退失败');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [
|
|
||||||
'success' => $success,
|
|
||||||
'failed' => $failed,
|
|
||||||
'messages' => $messages,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return true|string true=成功，string=失败原因
|
|
||||||
*/
|
|
||||||
private static function rollbackOne(
|
|
||||||
int $logId,
|
|
||||||
int $adminId,
|
|
||||||
string $adminName,
|
|
||||||
string $adminAccount,
|
|
||||||
string $ip,
|
|
||||||
int $now
|
|
||||||
): bool|string {
|
|
||||||
Db::startTrans();
|
|
||||||
try {
|
|
||||||
$log = Db::name('tcm_diagnosis_auto_assign_log')
|
|
||||||
->where('id', $logId)
|
|
||||||
->lock(true)
|
|
||||||
->find();
|
|
||||||
if ($log === null || $log === []) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return sprintf('日志#%d：记录不存在', $logId);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((int) ($log['action'] ?? 0) !== 1) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return sprintf('日志#%d：仅「已分配」记录可回退', $logId);
|
|
||||||
}
|
|
||||||
if ((int) ($log['rollback_time'] ?? 0) > 0) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return sprintf('日志#%d：已回退，勿重复操作', $logId);
|
|
||||||
}
|
|
||||||
|
|
||||||
$diagnosisId = (int) ($log['diagnosis_id'] ?? 0);
|
|
||||||
$assignedAssistantId = (int) ($log['assistant_id'] ?? 0);
|
|
||||||
if ($diagnosisId <= 0 || $assignedAssistantId <= 0) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return sprintf('日志#%d：数据不完整，无法回退', $logId);
|
|
||||||
}
|
|
||||||
|
|
||||||
$diag = Db::name('tcm_diagnosis')
|
|
||||||
->where('id', $diagnosisId)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->lock(true)
|
|
||||||
->field(['id', 'assistant_id'])
|
|
||||||
->find();
|
|
||||||
if ($diag === null || $diag === []) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return sprintf('日志#%d：诊单#%d 不存在', $logId, $diagnosisId);
|
|
||||||
}
|
|
||||||
|
|
||||||
$currentAssistantId = (int) ($diag['assistant_id'] ?? 0);
|
|
||||||
if ($currentAssistantId !== $assignedAssistantId) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return sprintf(
|
|
||||||
'日志#%d：诊单#%d 当前医助已变更（非自动分配的医助），跳过回退',
|
|
||||||
$logId,
|
|
||||||
$diagnosisId
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$prevAssistantId = self::resolvePreviousAssistantIdFromAutoAssign(
|
|
||||||
$diagnosisId,
|
|
||||||
$assignedAssistantId,
|
|
||||||
(int) ($log['create_time'] ?? 0)
|
|
||||||
);
|
|
||||||
|
|
||||||
$poSnap = Db::name('tcm_prescription_order')
|
|
||||||
->where('diagnosis_id', $diagnosisId)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->order(['create_time' => 'desc', 'id' => 'desc'])
|
|
||||||
->field(['creator_id', 'create_time'])
|
|
||||||
->find();
|
|
||||||
$relatedPoCreatorId = (int) ($poSnap['creator_id'] ?? 0);
|
|
||||||
$relatedPoCreateTime = (int) ($poSnap['create_time'] ?? 0);
|
|
||||||
if ($relatedPoCreateTime <= 0) {
|
|
||||||
$relatedPoCreateTime = $now;
|
|
||||||
$relatedPoCreatorId = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
Db::name('tcm_diagnosis')
|
|
||||||
->where('id', $diagnosisId)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->update([
|
|
||||||
'assistant_id' => $prevAssistantId,
|
|
||||||
'assign_read_at' => $prevAssistantId > 0 ? null : 0,
|
|
||||||
]);
|
|
||||||
|
|
||||||
Db::name('tcm_diagnosis_assign_log')->insert([
|
|
||||||
'diagnosis_id' => $diagnosisId,
|
|
||||||
'from_assistant_id' => $currentAssistantId,
|
|
||||||
'to_assistant_id' => $prevAssistantId,
|
|
||||||
'operator_admin_id' => $adminId,
|
|
||||||
'operator_name' => $adminName !== '' ? $adminName : '回退自动分配',
|
|
||||||
'operator_account' => $adminAccount,
|
|
||||||
'ip' => $ip,
|
|
||||||
'related_po_creator_id' => $relatedPoCreatorId,
|
|
||||||
'related_po_create_time' => $relatedPoCreateTime,
|
|
||||||
'is_inherit' => 0,
|
|
||||||
'create_time' => $now,
|
|
||||||
]);
|
|
||||||
|
|
||||||
Db::name('tcm_diagnosis_auto_assign_log')
|
|
||||||
->where('id', $logId)
|
|
||||||
->update([
|
|
||||||
'rollback_time' => $now,
|
|
||||||
'rollback_admin_id' => $adminId,
|
|
||||||
'rollback_admin_name' => $adminName,
|
|
||||||
]);
|
|
||||||
|
|
||||||
Db::commit();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
Db::rollback();
|
|
||||||
throw $e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 从「系统自动分配」指派日志取 from_assistant_id 作为回退目标。
|
|
||||||
*/
|
|
||||||
private static function resolvePreviousAssistantIdFromAutoAssign(
|
|
||||||
int $diagnosisId,
|
|
||||||
int $assignedAssistantId,
|
|
||||||
int $autoLogCreateTime
|
|
||||||
): int {
|
|
||||||
$query = Db::name('tcm_diagnosis_assign_log')
|
|
||||||
->where('diagnosis_id', $diagnosisId)
|
|
||||||
->where('to_assistant_id', $assignedAssistantId)
|
|
||||||
->where('operator_name', '系统自动分配');
|
|
||||||
|
|
||||||
if ($autoLogCreateTime > 0) {
|
|
||||||
$query->where('create_time', '>=', $autoLogCreateTime - 30)
|
|
||||||
->where('create_time', '<=', $autoLogCreateTime + 30);
|
|
||||||
}
|
|
||||||
|
|
||||||
$row = $query->order('id', 'desc')->field(['from_assistant_id'])->find();
|
|
||||||
if ($row !== null && $row !== []) {
|
|
||||||
return (int) ($row['from_assistant_id'] ?? 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 兜底：不限时间窗再查最近一条系统自动分配
|
|
||||||
$fallback = Db::name('tcm_diagnosis_assign_log')
|
|
||||||
->where('diagnosis_id', $diagnosisId)
|
|
||||||
->where('to_assistant_id', $assignedAssistantId)
|
|
||||||
->where('operator_name', '系统自动分配')
|
|
||||||
->order('id', 'desc')
|
|
||||||
->field(['from_assistant_id'])
|
|
||||||
->find();
|
|
||||||
|
|
||||||
return (int) ($fallback['from_assistant_id'] ?? 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace app\adminapi\logic\stats;
|
namespace app\adminapi\logic\stats;
|
||||||
|
|
||||||
use app\adminapi\logic\dept\DeptLogic;
|
|
||||||
use think\facade\Db;
|
use think\facade\Db;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -13,11 +12,9 @@ use think\facade\Db;
|
|||||||
* 口径说明：
|
* 口径说明：
|
||||||
* - 当月被指派总数 = 当月内 `tcm_diagnosis_assign_log`（按 **指派操作时间 lg.create_time** 落月，to_assistant_id>0，
|
* - 当月被指派总数 = 当月内 `tcm_diagnosis_assign_log`（按 **指派操作时间 lg.create_time** 落月，to_assistant_id>0，
|
||||||
* **剔除勾选「继承」的指派 is_inherit=1**，诊单未删除）去重后的「医助 × 诊单」组合；
|
* **剔除勾选「继承」的指派 is_inherit=1**，诊单未删除）去重后的「医助 × 诊单」组合；
|
||||||
* 同一诊单当月被多次指派给同一医助只计 1 次；
|
* 同一诊单当月被多次指派给同一医助只计 1 次。
|
||||||
* **再剔除**名下存在履约「拒收(9) / 退款(10)」业务订单（未软删）的诊单。
|
|
||||||
* - 第 N 次下单 = 诊单（患者）名下计入业绩的业务订单（剔除履约 4/9/10、软删）按 create_time 升序的**全局**序列中第 N 笔；
|
* - 第 N 次下单 = 诊单（患者）名下计入业绩的业务订单（剔除履约 4/9/10、软删）按 create_time 升序的**全局**序列中第 N 笔；
|
||||||
* 诊次**跨月累计不重置**：例如 5 月指派后旗下成交 4 单为二诊~五诊，6 月再成交即为六诊。
|
* 诊次**跨月累计不重置**：例如 5 月指派后旗下成交 4 单为二诊~五诊，6 月再成交即为六诊。
|
||||||
* 诊单可配置 `revisit_slot_start_offset`（默认 0：第 1 笔实单计为一诊；设为 1 则第 1 笔实单计为二诊；设为 2 则计为三诊，即在实单序号上叠加偏移，5 笔实单+偏移 2 等价于计至七诊）。
|
|
||||||
* - 当月 N 诊单数 = **当月内下单**且全局序号为 N 的订单数，归属下单时点的**持有医助**——
|
* - 当月 N 诊单数 = **当月内下单**且全局序号为 N 的订单数，归属下单时点的**持有医助**——
|
||||||
* 按指派日志时间线取「订单时间之前最近一次指派」的 to_assistant_id（释放 to=0 即不再归属；
|
* 按指派日志时间线取「订单时间之前最近一次指派」的 to_assistant_id（释放 to=0 即不再归属；
|
||||||
* 「继承」指派会转移持有人用于归属，但不计被指派数）。指派可发生在往月。
|
* 「继承」指派会转移持有人用于归属，但不计被指派数）。指派可发生在往月。
|
||||||
@@ -25,8 +22,7 @@ use think\facade\Db;
|
|||||||
* 医助当月无新指派但旗下有成交时，被指派数为 0、比率显示为空。
|
* 医助当月无新指派但旗下有成交时，被指派数为 0、比率显示为空。
|
||||||
* - 分档动态产出：N 从 2 起，至当月命中数据的最大序号（至少展示到四诊，上限 MAX_VISIT_SLOT 防御异常数据），
|
* - 分档动态产出：N 从 2 起，至当月命中数据的最大序号（至少展示到四诊，上限 MAX_VISIT_SLOT 防御异常数据），
|
||||||
* 返回 `slots` 列表供前端动态渲染「五诊」「六诊」… 列。
|
* 返回 `slots` 列表供前端动态渲染「五诊」「六诊」… 列。
|
||||||
* - 部门归类：医助按其人事部门（admin_dept 最小 dept_id）归组；**仅统计「二中心」及其组织下级**（与 DeptLogic::getErCenterSubtreeDeptIdSet 一致）；
|
* - 部门归类：医助按其人事部门（admin_dept 最小 dept_id）归组；部门筛选（dept_ids，含组织下级）按该归属部门过滤。
|
||||||
* 部门筛选下拉与未选部门时的默认范围均限定在该子树内，选定部门时含其组织下级。
|
|
||||||
* - 部门行 / 合计行：被指派数按诊单去重（可能小于下级行相加）；N 诊单数为下级行求和（每笔订单唯一归属一名医助）。
|
* - 部门行 / 合计行：被指派数按诊单去重（可能小于下级行相加）；N 诊单数为下级行求和（每笔订单唯一归属一名医助）。
|
||||||
*/
|
*/
|
||||||
class RevisitRateLogic
|
class RevisitRateLogic
|
||||||
@@ -298,19 +294,14 @@ class RevisitRateLogic
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门下拉：仅「二中心」及其组织下级（与业绩看板 ErCenter 子树一致）。
|
* 部门下拉（全量未删除部门，前端组树）。
|
||||||
*
|
*
|
||||||
* @return array{rows: list<array{id:int,pid:int,name:string}>}
|
* @return array{rows: list<array{id:int,pid:int,name:string}>}
|
||||||
*/
|
*/
|
||||||
public static function deptOptions(): array
|
public static function deptOptions(): array
|
||||||
{
|
{
|
||||||
$erSet = DeptLogic::getErCenterSubtreeDeptIdSet();
|
|
||||||
if ($erSet === []) {
|
|
||||||
return ['rows' => []];
|
|
||||||
}
|
|
||||||
$rows = Db::name('dept')
|
$rows = Db::name('dept')
|
||||||
->whereNull('delete_time')
|
->whereNull('delete_time')
|
||||||
->whereIn('id', array_keys($erSet))
|
|
||||||
->field(['id', 'pid', 'name'])
|
->field(['id', 'pid', 'name'])
|
||||||
->order('sort', 'desc')
|
->order('sort', 'desc')
|
||||||
->order('id', 'asc')
|
->order('id', 'asc')
|
||||||
@@ -331,9 +322,9 @@ class RevisitRateLogic
|
|||||||
/**
|
/**
|
||||||
* 核心统计上下文：
|
* 核心统计上下文：
|
||||||
* 1. 全量指派日志（≤ 月末）构建持有时间线；
|
* 1. 全量指派日志（≤ 月末）构建持有时间线；
|
||||||
* 2. 分母：当月非继承指派的「医助 × 诊单」，再剔除名下存在拒收(9)/退款(10) 订单的诊单；
|
* 2. 分母：当月非继承指派的「医助 × 诊单」；
|
||||||
* 3. 分子：曾被指派诊单的当月订单，统计诊次 = 实单序号 + 诊单偏移（默认第 1 笔实单为一诊）；
|
* 3. 分子：曾被指派诊单的当月订单按全局序号 ≥2 归属持有医助；
|
||||||
* 4. 应用部门筛选：默认限定「二中心」子树；选定部门时再收窄到该部门及其下级（且须落在二中心子树内）。
|
* 4. 应用部门筛选（含组织下级）。
|
||||||
*
|
*
|
||||||
* @param array{month?:string,dept_ids?:int[]|string} $params
|
* @param array{month?:string,dept_ids?:int[]|string} $params
|
||||||
*
|
*
|
||||||
@@ -384,35 +375,9 @@ class RevisitRateLogic
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 分母：剔除名下存在拒收(9)/退款(10) 业务订单的诊单（与明细 assignLines 同口径）
|
// 分子：曾被指派诊单的当月订单（全局序号 ≥2），归属下单时点的持有医助
|
||||||
$assignedDiagIds = [];
|
|
||||||
foreach ($diagsByAssistant as $diagSet) {
|
|
||||||
foreach ($diagSet as $did => $_) {
|
|
||||||
$assignedDiagIds[(int) $did] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$refundRejectDiagSet = self::fetchRefundOrRejectDiagnosisSet(array_keys($assignedDiagIds));
|
|
||||||
if ($refundRejectDiagSet !== []) {
|
|
||||||
foreach ($diagsByAssistant as $aid => $diagSet) {
|
|
||||||
foreach ($diagSet as $did => $_) {
|
|
||||||
if (isset($refundRejectDiagSet[$did])) {
|
|
||||||
unset($diagsByAssistant[$aid][$did]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($diagsByAssistant[$aid] === []) {
|
|
||||||
unset($diagsByAssistant[$aid]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$pairsRaw = array_values(array_filter(
|
|
||||||
$pairsRaw,
|
|
||||||
static fn (array $p): bool => !isset($refundRejectDiagSet[(int) $p['diagnosis_id']])
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
// 分子：曾被指派诊单的当月订单，统计诊次 = 实单全局序号 + 诊单偏移（默认偏移 0 → 第 1 笔实单为一诊）
|
|
||||||
/** @var array<int, array<int, list<array<string, mixed>>>> $slotOrdersByAssistant */
|
/** @var array<int, array<int, list<array<string, mixed>>>> $slotOrdersByAssistant */
|
||||||
$slotOrdersByAssistant = [];
|
$slotOrdersByAssistant = [];
|
||||||
$offsetMap = self::fetchRevisitSlotStartOffsetMap(array_keys($candidateDiagSet));
|
|
||||||
foreach (array_chunk(array_keys($candidateDiagSet), 2000) as $chunk) {
|
foreach (array_chunk(array_keys($candidateDiagSet), 2000) as $chunk) {
|
||||||
$orderRows = self::fetchOrderSeqRows(
|
$orderRows = self::fetchOrderSeqRows(
|
||||||
$chunk,
|
$chunk,
|
||||||
@@ -422,7 +387,6 @@ class RevisitRateLogic
|
|||||||
$seq = 0;
|
$seq = 0;
|
||||||
$ptr = 0;
|
$ptr = 0;
|
||||||
$holder = 0;
|
$holder = 0;
|
||||||
$offset = 0;
|
|
||||||
foreach ($orderRows as $r) {
|
foreach ($orderRows as $r) {
|
||||||
$did = (int) ($r['diagnosis_id'] ?? 0);
|
$did = (int) ($r['diagnosis_id'] ?? 0);
|
||||||
if ($did <= 0) {
|
if ($did <= 0) {
|
||||||
@@ -433,10 +397,8 @@ class RevisitRateLogic
|
|||||||
$seq = 0;
|
$seq = 0;
|
||||||
$ptr = 0;
|
$ptr = 0;
|
||||||
$holder = 0;
|
$holder = 0;
|
||||||
$offset = self::resolveRevisitSlotStartOffset($did, $offsetMap);
|
|
||||||
}
|
}
|
||||||
$seq++;
|
$seq++;
|
||||||
$effectiveSlot = $seq + $offset;
|
|
||||||
$ct = (int) ($r['create_time'] ?? 0);
|
$ct = (int) ($r['create_time'] ?? 0);
|
||||||
// 推进时间线指针：订单时间之前（含同刻）最近一次指派的持有人
|
// 推进时间线指针：订单时间之前（含同刻）最近一次指派的持有人
|
||||||
$tl = $timeline[$did] ?? [];
|
$tl = $timeline[$did] ?? [];
|
||||||
@@ -445,27 +407,24 @@ class RevisitRateLogic
|
|||||||
$holder = (int) $tl[$ptr]['to'];
|
$holder = (int) $tl[$ptr]['to'];
|
||||||
$ptr++;
|
$ptr++;
|
||||||
}
|
}
|
||||||
if ($effectiveSlot < 2 || $effectiveSlot > self::MAX_VISIT_SLOT) {
|
if ($seq < 2 || $seq > self::MAX_VISIT_SLOT) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($ct < $startTs || $ct > $endTs) {
|
if ($ct < $startTs || $ct > $endTs) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($holder > 0) {
|
if ($holder > 0) {
|
||||||
$slotOrdersByAssistant[$holder][$effectiveSlot][] = $r;
|
$slotOrdersByAssistant[$holder][$seq][] = $r;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 医助归属部门 + 部门筛选（默认仅二中心子树；选定部门时再收窄，含组织下级）
|
// 医助归属部门 + 部门筛选（含组织下级）
|
||||||
$universeIds = array_keys($diagsByAssistant + $slotOrdersByAssistant);
|
$universeIds = array_keys($diagsByAssistant + $slotOrdersByAssistant);
|
||||||
[$assistantDept, $deptNames] = self::buildAssistantDeptIndex($universeIds);
|
[$assistantDept, $deptNames] = self::buildAssistantDeptIndex($universeIds);
|
||||||
$subtreeSet = self::resolveDeptFilterSet($params['dept_ids'] ?? null);
|
$deptFilterIds = self::parseDeptIds($params['dept_ids'] ?? null);
|
||||||
if ($subtreeSet === []) {
|
if ($deptFilterIds !== []) {
|
||||||
// 无二中心部门时整表为空，避免误展示其它中心数据
|
$subtreeSet = self::expandDeptSubtreeSet($deptFilterIds);
|
||||||
$diagsByAssistant = [];
|
|
||||||
$slotOrdersByAssistant = [];
|
|
||||||
} else {
|
|
||||||
foreach ($universeIds as $aid) {
|
foreach ($universeIds as $aid) {
|
||||||
$deptId = (int) ($assistantDept[$aid] ?? 0);
|
$deptId = (int) ($assistantDept[$aid] ?? 0);
|
||||||
if ($deptId <= 0 || !isset($subtreeSet[$deptId])) {
|
if ($deptId <= 0 || !isset($subtreeSet[$deptId])) {
|
||||||
@@ -584,45 +543,6 @@ class RevisitRateLogic
|
|||||||
return [$canonical, $names];
|
return [$canonical, $names];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 部门筛选集合：始终落在「二中心」子树内。
|
|
||||||
* - 未传 dept_ids：整棵二中心子树
|
|
||||||
* - 已传：所选部门及其下级 ∩ 二中心子树（非法/非二中心 id 被忽略）
|
|
||||||
*
|
|
||||||
* @param mixed $raw
|
|
||||||
*
|
|
||||||
* @return array<int, true>
|
|
||||||
*/
|
|
||||||
private static function resolveDeptFilterSet(mixed $raw): array
|
|
||||||
{
|
|
||||||
$erSet = DeptLogic::getErCenterSubtreeDeptIdSet();
|
|
||||||
if ($erSet === []) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
$deptFilterIds = self::parseDeptIds($raw);
|
|
||||||
if ($deptFilterIds === []) {
|
|
||||||
return $erSet;
|
|
||||||
}
|
|
||||||
$allowedRoots = [];
|
|
||||||
foreach ($deptFilterIds as $id) {
|
|
||||||
if (isset($erSet[$id])) {
|
|
||||||
$allowedRoots[] = $id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($allowedRoots === []) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
$expanded = self::expandDeptSubtreeSet($allowedRoots);
|
|
||||||
$out = [];
|
|
||||||
foreach ($expanded as $id => $_) {
|
|
||||||
if (isset($erSet[$id])) {
|
|
||||||
$out[$id] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $raw int[] | 逗号分隔字符串
|
* @param mixed $raw int[] | 逗号分隔字符串
|
||||||
*
|
*
|
||||||
@@ -676,35 +596,6 @@ class RevisitRateLogic
|
|||||||
return $set;
|
return $set;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 名下存在履约「拒收(9) / 退款(10)」业务订单（未软删）的诊单集合。
|
|
||||||
* 用于「当月被指派总数」分母过滤；不限订单创建月份。
|
|
||||||
*
|
|
||||||
* @param list<int> $diagIds
|
|
||||||
*
|
|
||||||
* @return array<int, true>
|
|
||||||
*/
|
|
||||||
private static function fetchRefundOrRejectDiagnosisSet(array $diagIds): array
|
|
||||||
{
|
|
||||||
if ($diagIds === []) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
$out = [];
|
|
||||||
foreach (array_chunk($diagIds, 2000) as $chunk) {
|
|
||||||
$ids = Db::name('tcm_prescription_order')
|
|
||||||
->whereIn('diagnosis_id', $chunk)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->whereIn('fulfillment_status', [9, 10])
|
|
||||||
->group('diagnosis_id')
|
|
||||||
->column('diagnosis_id');
|
|
||||||
foreach ($ids as $id) {
|
|
||||||
$out[(int) $id] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 诊单订单序列源查询（与业绩口径一致），统一排序保证序号稳定。
|
* 诊单订单序列源查询（与业绩口径一致），统一排序保证序号稳定。
|
||||||
*
|
*
|
||||||
@@ -728,48 +619,6 @@ class RevisitRateLogic
|
|||||||
->toArray();
|
->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param list<int> $diagIds
|
|
||||||
*
|
|
||||||
* @return array<int, int> diagnosis_id => revisit_slot_start_offset
|
|
||||||
*/
|
|
||||||
private static function fetchRevisitSlotStartOffsetMap(array $diagIds): array
|
|
||||||
{
|
|
||||||
if ($diagIds === []) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
$out = [];
|
|
||||||
foreach (array_chunk($diagIds, 2000) as $chunk) {
|
|
||||||
$rows = Db::name('tcm_diagnosis')
|
|
||||||
->whereIn('id', $chunk)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->column('revisit_slot_start_offset', 'id');
|
|
||||||
foreach ($rows as $id => $offset) {
|
|
||||||
$out[(int) $id] = (int) $offset;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 诊单复诊统计起始偏移（默认 0：第 1 笔实单计为一诊；统计诊次 = 实单序号 + 偏移）
|
|
||||||
*
|
|
||||||
* @param array<int, int> $offsetMap
|
|
||||||
*/
|
|
||||||
private static function resolveRevisitSlotStartOffset(int $diagId, array $offsetMap): int
|
|
||||||
{
|
|
||||||
$offset = (int) ($offsetMap[$diagId] ?? 0);
|
|
||||||
if ($offset < 0) {
|
|
||||||
$offset = 0;
|
|
||||||
}
|
|
||||||
if ($offset > 20) {
|
|
||||||
$offset = 20;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param list<int> $diagIds
|
* @param list<int> $diagIds
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -748,49 +748,6 @@ class DiagnosisLogic extends BaseLogic
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 诊单指派医助操作记录列表
|
|
||||||
*/
|
|
||||||
public static function setRevisitSlotStartOffset(int $diagnosisId, int $offset, array $adminInfo): bool
|
|
||||||
{
|
|
||||||
self::$error = '';
|
|
||||||
if ($diagnosisId <= 0) {
|
|
||||||
self::setError('诊单不存在');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ($offset < 0 || $offset > 20) {
|
|
||||||
self::setError('起始偏移须在 0～20 之间');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$diagnosis = Diagnosis::where('id', $diagnosisId)->whereNull('delete_time')->find();
|
|
||||||
if (!$diagnosis) {
|
|
||||||
self::setError('诊单不存在');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$old = (int) ($diagnosis->revisit_slot_start_offset ?? 0);
|
|
||||||
if ($old < 0) {
|
|
||||||
$old = 0;
|
|
||||||
}
|
|
||||||
if ($old > 20) {
|
|
||||||
$old = 20;
|
|
||||||
}
|
|
||||||
if ($old === $offset) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
$diagnosis->save(['revisit_slot_start_offset' => $offset]);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
self::setError($e->getMessage());
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @notes 诊单指派医助操作记录列表
|
* @notes 诊单指派医助操作记录列表
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -2375,123 +2375,6 @@ class PrescriptionOrderLogic
|
|||||||
->toArray();
|
->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 手工新增操作日志；可选单独调整处方审核 / 支付单审核状态（不触发常规审核流程副作用）
|
|
||||||
*
|
|
||||||
* @param array<string,mixed> $params id, summary, prescription_audit_status?, payment_slip_audit_status?, prescription_audit_remark?, payment_slip_audit_remark?
|
|
||||||
* @return array<string,mixed>|false
|
|
||||||
*/
|
|
||||||
public static function addLog(array $params, int $adminId, array $adminInfo)
|
|
||||||
{
|
|
||||||
self::$error = '';
|
|
||||||
$id = (int) ($params['id'] ?? 0);
|
|
||||||
$summary = mb_substr(trim((string) ($params['summary'] ?? '')), 0, 500);
|
|
||||||
if ($summary === '') {
|
|
||||||
self::$error = '请填写日志内容';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$order = PrescriptionOrder::where('id', $id)->whereNull('delete_time')->find();
|
|
||||||
if (!$order) {
|
|
||||||
self::$error = '订单不存在';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!self::canAccessOrder($order, $adminId, $adminInfo)) {
|
|
||||||
self::$error = '无权限操作';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$changeParts = [];
|
|
||||||
$hasRxChange = array_key_exists('prescription_audit_status', $params)
|
|
||||||
&& $params['prescription_audit_status'] !== ''
|
|
||||||
&& $params['prescription_audit_status'] !== null;
|
|
||||||
$hasPayChange = array_key_exists('payment_slip_audit_status', $params)
|
|
||||||
&& $params['payment_slip_audit_status'] !== ''
|
|
||||||
&& $params['payment_slip_audit_status'] !== null;
|
|
||||||
|
|
||||||
if ($hasRxChange) {
|
|
||||||
if (!self::canAuditPrescriptionOrder($adminInfo)) {
|
|
||||||
self::$error = '无处方审核权限，不能调整处方审核状态';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$newRx = (int) $params['prescription_audit_status'];
|
|
||||||
if (!in_array($newRx, [0, 1, 2], true)) {
|
|
||||||
self::$error = '处方审核状态无效';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$oldRx = (int) $order->prescription_audit_status;
|
|
||||||
if ($newRx !== $oldRx) {
|
|
||||||
$order->prescription_audit_status = $newRx;
|
|
||||||
$changeParts[] = '处方审核：' . self::auditStatusLabelForLog($oldRx)
|
|
||||||
. ' → ' . self::auditStatusLabelForLog($newRx);
|
|
||||||
}
|
|
||||||
if (array_key_exists('prescription_audit_remark', $params)) {
|
|
||||||
$order->prescription_audit_remark = mb_substr(trim((string) $params['prescription_audit_remark']), 0, 500);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($hasPayChange) {
|
|
||||||
if (!self::canAuditPaymentSlipOrder($adminInfo)) {
|
|
||||||
self::$error = '无支付单审核权限，不能调整支付单审核状态';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$newPay = (int) $params['payment_slip_audit_status'];
|
|
||||||
if (!in_array($newPay, [0, 1, 2], true)) {
|
|
||||||
self::$error = '支付单审核状态无效';
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$oldPay = (int) $order->payment_slip_audit_status;
|
|
||||||
if ($newPay !== $oldPay) {
|
|
||||||
$order->payment_slip_audit_status = $newPay;
|
|
||||||
$changeParts[] = '支付单审核：' . self::auditStatusLabelForLog($oldPay)
|
|
||||||
. ' → ' . self::auditStatusLabelForLog($newPay);
|
|
||||||
}
|
|
||||||
if (array_key_exists('payment_slip_audit_remark', $params)) {
|
|
||||||
$order->payment_slip_audit_remark = mb_substr(trim((string) $params['payment_slip_audit_remark']), 0, 500);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($hasRxChange || $hasPayChange) {
|
|
||||||
self::syncFulfillmentStatus($order);
|
|
||||||
try {
|
|
||||||
$order->save();
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
self::$error = $e->getMessage();
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$logSummary = $summary;
|
|
||||||
if ($changeParts !== []) {
|
|
||||||
$logSummary .= '（' . implode('；', $changeParts) . '）';
|
|
||||||
}
|
|
||||||
self::writeLog($id, $adminId, $adminInfo, 'manual_log', $logSummary);
|
|
||||||
|
|
||||||
$out = $order->toArray();
|
|
||||||
self::maskInternalCostIfNeeded($out, $adminInfo);
|
|
||||||
self::maskRemarkExtraIfNeeded($out, $adminInfo);
|
|
||||||
self::attachLinkedPayOrders($out);
|
|
||||||
|
|
||||||
return $out;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static function auditStatusLabelForLog(int $status): string
|
|
||||||
{
|
|
||||||
return match ($status) {
|
|
||||||
1 => '已通过',
|
|
||||||
2 => '已驳回',
|
|
||||||
default => '待审核',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 为「已发货/已签收」(fulfillment_status=5/6) 的业务订单新增一条关联支付单（zyt_order），
|
* 为「已发货/已签收」(fulfillment_status=5/6) 的业务订单新增一条关联支付单（zyt_order），
|
||||||
* 创建后将支付单链接到业务订单，并将处方/支付审核状态重置为待审核以启动再次审核流程。
|
* 创建后将支付单链接到业务订单，并将处方/支付审核状态重置为待审核以启动再次审核流程。
|
||||||
@@ -3224,207 +3107,6 @@ class PrescriptionOrderLogic
|
|||||||
return $type;
|
return $type;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出用：处方药材明细（主方/辅方分行，与处方笺一致）
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $rx
|
|
||||||
*/
|
|
||||||
public static function formatPrescriptionHerbsForExport(array $rx): string
|
|
||||||
{
|
|
||||||
[$mainHerbs, $auxHerbs] = self::splitPrescriptionHerbsFromRx($rx);
|
|
||||||
$formatList = static function (array $herbs): string {
|
|
||||||
$parts = [];
|
|
||||||
foreach ($herbs as $h) {
|
|
||||||
if (!\is_array($h)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$name = trim((string) ($h['name'] ?? ''));
|
|
||||||
if ($name === '') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$parts[] = $name . ' ' . self::formatExportDosageNumber((float) ($h['dosage'] ?? 0)) . 'g';
|
|
||||||
}
|
|
||||||
|
|
||||||
return implode('、', $parts);
|
|
||||||
};
|
|
||||||
|
|
||||||
$sections = [];
|
|
||||||
$mainText = $formatList($mainHerbs);
|
|
||||||
if ($mainText !== '') {
|
|
||||||
$sections[] = '主方：' . $mainText;
|
|
||||||
}
|
|
||||||
$auxText = $formatList($auxHerbs);
|
|
||||||
if ($auxText !== '') {
|
|
||||||
$sections[] = '辅方：' . $auxText;
|
|
||||||
}
|
|
||||||
|
|
||||||
return implode("\n", $sections);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出用：主方/辅方服用方式（与前端 buildUsageSegmentText / 处方笺同口径）
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $usage
|
|
||||||
*/
|
|
||||||
public static function formatUsageSegmentForExport(
|
|
||||||
array $usage,
|
|
||||||
string $prescriptionType = '浓缩水丸',
|
|
||||||
string $fallbackWay = '',
|
|
||||||
string $fallbackTime = ''
|
|
||||||
): string {
|
|
||||||
$pt = trim($prescriptionType) !== '' ? trim($prescriptionType) : '浓缩水丸';
|
|
||||||
$times = (int) ($usage['times_per_day'] ?? 0);
|
|
||||||
if ($times <= 0) {
|
|
||||||
$times = 3;
|
|
||||||
}
|
|
||||||
$amount = isset($usage['dosage_amount']) && $usage['dosage_amount'] !== '' && $usage['dosage_amount'] !== null
|
|
||||||
? (float) $usage['dosage_amount']
|
|
||||||
: 10.0;
|
|
||||||
$unit = trim((string) ($usage['usage_dosage_unit'] ?? ($usage['dosage_unit'] ?? '')));
|
|
||||||
if ($unit === '') {
|
|
||||||
$unit = $pt === '饮片' ? 'ml' : 'g';
|
|
||||||
}
|
|
||||||
$usageWay = trim((string) ($usage['usage_way'] ?? ''));
|
|
||||||
if ($usageWay === '') {
|
|
||||||
$usageWay = $fallbackWay !== '' ? $fallbackWay : '温水送服';
|
|
||||||
}
|
|
||||||
$usageTime = trim((string) ($usage['usage_time'] ?? ''));
|
|
||||||
if ($usageTime === '') {
|
|
||||||
$usageTime = $fallbackTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
$seg = ['每天' . $times . '次'];
|
|
||||||
if ($pt === '浓缩水丸') {
|
|
||||||
$bags = (int) ($usage['dosage_bag_count'] ?? 0);
|
|
||||||
if ($bags <= 0) {
|
|
||||||
$bags = 1;
|
|
||||||
}
|
|
||||||
$seg[] = '一次' . $bags . '袋';
|
|
||||||
$seg[] = '每袋' . self::formatExportDosageNumber($amount) . $unit;
|
|
||||||
} else {
|
|
||||||
$seg[] = '一次' . self::formatExportDosageNumber($amount) . $unit;
|
|
||||||
}
|
|
||||||
$seg[] = $usageWay;
|
|
||||||
if ($usageTime !== '') {
|
|
||||||
$seg[] = $usageTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
return implode(', ', $seg);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出用：辅方用法 JSON 规范化（与前端 normalizeSlipAuxUsageForm 默认值一致）
|
|
||||||
*
|
|
||||||
* @return array<string, mixed>
|
|
||||||
*/
|
|
||||||
private static function normalizeAuxUsageForExport($raw, string $prescriptionType): array
|
|
||||||
{
|
|
||||||
$pt = trim($prescriptionType) !== '' ? trim($prescriptionType) : '浓缩水丸';
|
|
||||||
if ($pt === '饮片') {
|
|
||||||
$base = [
|
|
||||||
'dosage_amount' => 50.0,
|
|
||||||
'dosage_bag_count' => 1,
|
|
||||||
'times_per_day' => 3,
|
|
||||||
'usage_days' => 7,
|
|
||||||
];
|
|
||||||
} elseif ($pt === '浓缩水丸') {
|
|
||||||
$base = [
|
|
||||||
'dosage_amount' => 5.0,
|
|
||||||
'dosage_bag_count' => 1,
|
|
||||||
'times_per_day' => 3,
|
|
||||||
'usage_days' => 7,
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
$base = [
|
|
||||||
'dosage_amount' => 1.0,
|
|
||||||
'dosage_bag_count' => 1,
|
|
||||||
'times_per_day' => 3,
|
|
||||||
'usage_days' => 7,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (\is_string($raw) && $raw !== '') {
|
|
||||||
$decoded = json_decode($raw, true);
|
|
||||||
$raw = \is_array($decoded) ? $decoded : null;
|
|
||||||
}
|
|
||||||
if (!\is_array($raw)) {
|
|
||||||
return $base;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [
|
|
||||||
'dosage_amount' => isset($raw['dosage_amount']) && $raw['dosage_amount'] !== '' && $raw['dosage_amount'] !== null
|
|
||||||
? (float) $raw['dosage_amount']
|
|
||||||
: $base['dosage_amount'],
|
|
||||||
'dosage_bag_count' => (int) ($raw['dosage_bag_count'] ?? 0) > 0
|
|
||||||
? (int) $raw['dosage_bag_count']
|
|
||||||
: $base['dosage_bag_count'],
|
|
||||||
'times_per_day' => (int) ($raw['times_per_day'] ?? 0) > 0
|
|
||||||
? (int) $raw['times_per_day']
|
|
||||||
: $base['times_per_day'],
|
|
||||||
'usage_days' => (int) ($raw['usage_days'] ?? 0) > 0
|
|
||||||
? (int) $raw['usage_days']
|
|
||||||
: $base['usage_days'],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array{0: array<int, array<string, mixed>>, 1: array<int, array<string, mixed>>}
|
|
||||||
*/
|
|
||||||
private static function splitPrescriptionHerbsFromRx(array $rx): array
|
|
||||||
{
|
|
||||||
$herbs = $rx['herbs'] ?? null;
|
|
||||||
if (\is_string($herbs) && $herbs !== '') {
|
|
||||||
$decoded = json_decode($herbs, true);
|
|
||||||
$herbs = \is_array($decoded) ? $decoded : [];
|
|
||||||
}
|
|
||||||
if (!\is_array($herbs)) {
|
|
||||||
$herbs = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
$mainHerbs = [];
|
|
||||||
$auxHerbs = [];
|
|
||||||
foreach ($herbs as $h) {
|
|
||||||
if (!\is_array($h)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (((string) ($h['formula_type'] ?? '')) === '辅方') {
|
|
||||||
$auxHerbs[] = $h;
|
|
||||||
} else {
|
|
||||||
$mainHerbs[] = $h;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [$mainHerbs, $auxHerbs];
|
|
||||||
}
|
|
||||||
|
|
||||||
private static function formatExportDosageNumber(float $dosage): string
|
|
||||||
{
|
|
||||||
if (floor($dosage) === $dosage) {
|
|
||||||
return (string) (int) $dosage;
|
|
||||||
}
|
|
||||||
|
|
||||||
return rtrim(rtrim(number_format($dosage, 4, '.', ''), '0'), '.');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出用：主方/辅方开立天数（与详情侧栏「处方开立」同口径：主方取处方 usage_days，辅方取 aux_usage.usage_days）
|
|
||||||
* 订单服用天数单独导出在 export_medication_days 列，不在此混用。
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $rx
|
|
||||||
* @param array<string, mixed>|null $auxUsage
|
|
||||||
*/
|
|
||||||
private static function resolveExportUsageDays(array $rx, ?array $auxUsage, bool $isAux): string
|
|
||||||
{
|
|
||||||
if ($isAux) {
|
|
||||||
$days = (int) ($auxUsage['usage_days'] ?? 0);
|
|
||||||
|
|
||||||
return $days > 0 ? (string) $days : '';
|
|
||||||
}
|
|
||||||
$days = (int) ($rx['usage_days'] ?? 0);
|
|
||||||
|
|
||||||
return $days > 0 ? (string) $days : '';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出列：挂号表渠道来源展示（与 AppointmentLists channel_source_desc 同字典口径）
|
* 导出列：挂号表渠道来源展示（与 AppointmentLists channel_source_desc 同字典口径）
|
||||||
*
|
*
|
||||||
@@ -3721,12 +3403,7 @@ class PrescriptionOrderLogic
|
|||||||
$rxById = [];
|
$rxById = [];
|
||||||
if ($rxIdList !== []) {
|
if ($rxIdList !== []) {
|
||||||
$rxRows = Prescription::whereIn('id', $rxIdList)->whereNull('delete_time')
|
$rxRows = Prescription::whereIn('id', $rxIdList)->whereNull('delete_time')
|
||||||
->field([
|
->field(['id', 'prescription_type', 'need_decoction', 'dose_unit', 'assistant_id', 'appointment_id', 'prescription_name', 'aux_usage', 'herbs', 'creator_id'])
|
||||||
'id', 'prescription_type', 'need_decoction', 'dose_unit', 'assistant_id', 'appointment_id',
|
|
||||||
'prescription_name', 'aux_usage', 'herbs', 'creator_id',
|
|
||||||
'dosage_amount', 'dosage_unit', 'dosage_bag_count', 'times_per_day', 'usage_days',
|
|
||||||
'usage_way', 'usage_time',
|
|
||||||
])
|
|
||||||
->select()
|
->select()
|
||||||
->toArray();
|
->toArray();
|
||||||
foreach ($rxRows as $xr) {
|
foreach ($rxRows as $xr) {
|
||||||
@@ -3960,38 +3637,6 @@ class PrescriptionOrderLogic
|
|||||||
}
|
}
|
||||||
$item['export_prescription_name'] = implode(' ', $rxNameParts);
|
$item['export_prescription_name'] = implode(' ', $rxNameParts);
|
||||||
|
|
||||||
$rxArr = \is_array($rx) ? $rx : [];
|
|
||||||
$rxType = trim((string) ($rxArr['prescription_type'] ?? '')) ?: '浓缩水丸';
|
|
||||||
$item['export_prescription_herbs'] = self::formatPrescriptionHerbsForExport($rxArr);
|
|
||||||
$item['export_main_usage'] = $rxArr !== []
|
|
||||||
? self::formatUsageSegmentForExport($rxArr, $rxType)
|
|
||||||
: '';
|
|
||||||
[, $auxHerbs] = self::splitPrescriptionHerbsFromRx($rxArr);
|
|
||||||
$auxUsageNorm = $auxHerbs !== []
|
|
||||||
? self::normalizeAuxUsageForExport($rxArr['aux_usage'] ?? null, $rxType)
|
|
||||||
: null;
|
|
||||||
if ($auxHerbs !== [] && $auxUsageNorm !== null) {
|
|
||||||
$item['export_aux_usage'] = self::formatUsageSegmentForExport(
|
|
||||||
[
|
|
||||||
'dosage_amount' => $auxUsageNorm['dosage_amount'],
|
|
||||||
'dosage_bag_count' => $auxUsageNorm['dosage_bag_count'],
|
|
||||||
'times_per_day' => $auxUsageNorm['times_per_day'],
|
|
||||||
'usage_dosage_unit' => $rxArr['dosage_unit'] ?? '',
|
|
||||||
'usage_way' => $rxArr['usage_way'] ?? '',
|
|
||||||
'usage_time' => $rxArr['usage_time'] ?? '',
|
|
||||||
],
|
|
||||||
$rxType,
|
|
||||||
(string) ($rxArr['usage_way'] ?? ''),
|
|
||||||
(string) ($rxArr['usage_time'] ?? '')
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
$item['export_aux_usage'] = '';
|
|
||||||
}
|
|
||||||
$item['export_main_usage_days'] = self::resolveExportUsageDays($rxArr, $auxUsageNorm, false);
|
|
||||||
$item['export_aux_usage_days'] = $auxHerbs !== []
|
|
||||||
? self::resolveExportUsageDays($rxArr, $auxUsageNorm, true)
|
|
||||||
: '';
|
|
||||||
|
|
||||||
$item['export_service_package'] = self::formatServicePackageForExport(
|
$item['export_service_package'] = self::formatServicePackageForExport(
|
||||||
$item['service_package'] ?? '',
|
$item['service_package'] ?? '',
|
||||||
$packageNameByValue
|
$packageNameByValue
|
||||||
@@ -4162,7 +3807,27 @@ class PrescriptionOrderLogic
|
|||||||
|
|
||||||
$doctorId = (int) ($rx['creator_id'] ?? 0);
|
$doctorId = (int) ($rx['creator_id'] ?? 0);
|
||||||
|
|
||||||
[$mainHerbs, $auxHerbs] = self::splitPrescriptionHerbsFromRx($rx);
|
$herbs = $rx['herbs'] ?? null;
|
||||||
|
if (\is_string($herbs) && $herbs !== '') {
|
||||||
|
$decoded = json_decode($herbs, true);
|
||||||
|
$herbs = \is_array($decoded) ? $decoded : [];
|
||||||
|
}
|
||||||
|
if (!\is_array($herbs)) {
|
||||||
|
$herbs = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$mainHerbs = [];
|
||||||
|
$auxHerbs = [];
|
||||||
|
foreach ($herbs as $h) {
|
||||||
|
if (!\is_array($h)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (((string) ($h['formula_type'] ?? '')) === '辅方') {
|
||||||
|
$auxHerbs[] = $h;
|
||||||
|
} else {
|
||||||
|
$mainHerbs[] = $h;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$lookup = static function (string $ft, array $hs) use ($doctorId, $libByDoctor, $libPublic): string {
|
$lookup = static function (string $ft, array $hs) use ($doctorId, $libByDoctor, $libPublic): string {
|
||||||
if ($hs === []) {
|
if ($hs === []) {
|
||||||
@@ -4881,175 +4546,4 @@ class PrescriptionOrderLogic
|
|||||||
{
|
{
|
||||||
self::writeLog($prescriptionOrderId, $adminId, $adminInfo, 'patch_rx_patient', $summary);
|
self::writeLog($prescriptionOrderId, $adminId, $adminInfo, 'patch_rx_patient', $summary);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 业务订单详情场景：更新主方/辅方服用次数与开立天数，以及订单服用天数
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $params
|
|
||||||
*/
|
|
||||||
public static function patchPrescriptionUsage(array $params, int $adminId, array $adminInfo): bool
|
|
||||||
{
|
|
||||||
self::$error = '';
|
|
||||||
$prescriptionOrderId = (int) ($params['id'] ?? 0);
|
|
||||||
$order = PrescriptionOrder::where('id', $prescriptionOrderId)->whereNull('delete_time')->find();
|
|
||||||
if (!$order) {
|
|
||||||
self::setError('订单不存在');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!self::canAccessOrder($order, $adminId, $adminInfo)) {
|
|
||||||
self::setError('无权限操作');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ((int) $order->fulfillment_status === 4) {
|
|
||||||
self::setError('已取消的订单不可修改');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$rxId = (int) ($order->prescription_id ?? 0);
|
|
||||||
if ($rxId <= 0) {
|
|
||||||
self::setError('该订单未关联处方');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$rx = Prescription::where('id', $rxId)->whereNull('delete_time')->find();
|
|
||||||
if (!$rx) {
|
|
||||||
self::setError('处方不存在');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!PrescriptionLogic::canViewPrescription($rx, $adminId, $adminInfo)) {
|
|
||||||
self::setError('无权限修改此处方');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$timesPerDay = (int) ($params['times_per_day'] ?? 0);
|
|
||||||
$usageDays = (int) ($params['usage_days'] ?? 0);
|
|
||||||
$medDays = (int) ($params['medication_days'] ?? 0);
|
|
||||||
if ($timesPerDay < 1 || $timesPerDay > 6) {
|
|
||||||
self::setError('主方每天次数须在 1～6 之间');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ($usageDays < 1 || $usageDays > 999) {
|
|
||||||
self::setError('主方开立天数须在 1～999 之间');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ($medDays < 1 || $medDays > 999) {
|
|
||||||
self::setError('订单服用天数须在 1～999 之间');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$hasAux = self::prescriptionHasAuxFormula($rx);
|
|
||||||
$auxTimesPerDay = null;
|
|
||||||
$auxUsageDays = null;
|
|
||||||
if ($hasAux) {
|
|
||||||
if (!array_key_exists('aux_times_per_day', $params) || !array_key_exists('aux_usage_days', $params)) {
|
|
||||||
self::setError('含辅方处方须填写辅方服用参数');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$auxTimesPerDay = (int) $params['aux_times_per_day'];
|
|
||||||
$auxUsageDays = (int) $params['aux_usage_days'];
|
|
||||||
if ($auxTimesPerDay < 1 || $auxTimesPerDay > 6) {
|
|
||||||
self::setError('辅方每天次数须在 1～6 之间');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ($auxUsageDays < 1 || $auxUsageDays > 999) {
|
|
||||||
self::setError('辅方开立天数须在 1～999 之间');
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$oldTimes = (int) ($rx->times_per_day ?? 0);
|
|
||||||
$oldUsageDays = (int) ($rx->usage_days ?? 0);
|
|
||||||
$oldMedDays = (int) ($order->medication_days ?? 0);
|
|
||||||
$oldAuxUsage = $rx->aux_usage;
|
|
||||||
if (is_string($oldAuxUsage)) {
|
|
||||||
$decoded = json_decode($oldAuxUsage, true);
|
|
||||||
$oldAuxUsage = is_array($decoded) ? $decoded : [];
|
|
||||||
}
|
|
||||||
if (!is_array($oldAuxUsage)) {
|
|
||||||
$oldAuxUsage = [];
|
|
||||||
}
|
|
||||||
$oldAuxTimes = (int) ($oldAuxUsage['times_per_day'] ?? 0);
|
|
||||||
$oldAuxUsageDays = (int) ($oldAuxUsage['usage_days'] ?? 0);
|
|
||||||
|
|
||||||
try {
|
|
||||||
$rxUpdates = [
|
|
||||||
'times_per_day' => $timesPerDay,
|
|
||||||
'usage_days' => $usageDays,
|
|
||||||
];
|
|
||||||
if ($hasAux) {
|
|
||||||
$auxUsage = $oldAuxUsage;
|
|
||||||
$auxUsage['times_per_day'] = $auxTimesPerDay;
|
|
||||||
$auxUsage['usage_days'] = $auxUsageDays;
|
|
||||||
$rxUpdates['aux_usage'] = $auxUsage;
|
|
||||||
}
|
|
||||||
$rx->save($rxUpdates);
|
|
||||||
|
|
||||||
$order->medication_days = $medDays;
|
|
||||||
$order->save();
|
|
||||||
|
|
||||||
$parts = [
|
|
||||||
sprintf(
|
|
||||||
'主方 每天%d次/开立%d天 → 每天%d次/开立%d天',
|
|
||||||
$oldTimes > 0 ? $oldTimes : 0,
|
|
||||||
$oldUsageDays > 0 ? $oldUsageDays : 0,
|
|
||||||
$timesPerDay,
|
|
||||||
$usageDays
|
|
||||||
),
|
|
||||||
];
|
|
||||||
if ($hasAux) {
|
|
||||||
$parts[] = sprintf(
|
|
||||||
'辅方 每天%d次/开立%d天 → 每天%d次/开立%d天',
|
|
||||||
$oldAuxTimes > 0 ? $oldAuxTimes : 0,
|
|
||||||
$oldAuxUsageDays > 0 ? $oldAuxUsageDays : 0,
|
|
||||||
$auxTimesPerDay,
|
|
||||||
$auxUsageDays
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$parts[] = sprintf(
|
|
||||||
'订单设置 %d天 → %d天',
|
|
||||||
$oldMedDays > 0 ? $oldMedDays : 0,
|
|
||||||
$medDays
|
|
||||||
);
|
|
||||||
$summary = '服用参数：' . implode('；', $parts);
|
|
||||||
self::writeLog($prescriptionOrderId, $adminId, $adminInfo, 'patch_rx_usage', $summary);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
self::setError($e->getMessage());
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 处方是否含辅方药材（与列表/详情 has_aux_formula 口径一致）
|
|
||||||
*/
|
|
||||||
private static function prescriptionHasAuxFormula(Prescription $rx): bool
|
|
||||||
{
|
|
||||||
$herbs = $rx->herbs;
|
|
||||||
if (is_string($herbs)) {
|
|
||||||
$decoded = json_decode($herbs, true);
|
|
||||||
$herbs = is_array($decoded) ? $decoded : [];
|
|
||||||
}
|
|
||||||
if (!is_array($herbs)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
foreach ($herbs as $h) {
|
|
||||||
if (is_array($h) && (string) ($h['formula_type'] ?? '') === '辅方') {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ class DiagnosisValidate extends BaseValidate
|
|||||||
'end_date' => 'date|checkDateRange',
|
'end_date' => 'date|checkDateRange',
|
||||||
'diagnosis_id' => 'require|integer|checkDiagnosisId',
|
'diagnosis_id' => 'require|integer|checkDiagnosisId',
|
||||||
'tracking_content' => 'require|length:1,1000',
|
'tracking_content' => 'require|length:1,1000',
|
||||||
'revisit_slot_start_offset' => 'integer|between:0,20',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $message = [
|
protected $message = [
|
||||||
@@ -140,13 +139,6 @@ class DiagnosisValidate extends BaseValidate
|
|||||||
return $this->only(['id']);
|
return $this->only(['id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 业务订单 tab：设置复诊接诊率统计起始偏移 */
|
|
||||||
public function sceneSetRevisitSlotStartOffset()
|
|
||||||
{
|
|
||||||
return $this->only(['id', 'revisit_slot_start_offset'])
|
|
||||||
->append('revisit_slot_start_offset', 'require|integer|between:0,20');
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function checkDiagnosis($value)
|
protected function checkDiagnosis($value)
|
||||||
{
|
{
|
||||||
$diagnosis = Diagnosis::findOrEmpty($value);
|
$diagnosis = Diagnosis::findOrEmpty($value);
|
||||||
|
|||||||
@@ -32,11 +32,6 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
'remark_assistant' => 'max:500',
|
'remark_assistant' => 'max:500',
|
||||||
'action' => 'require|in:approve,reject',
|
'action' => 'require|in:approve,reject',
|
||||||
'remark' => 'max:500',
|
'remark' => 'max:500',
|
||||||
'summary' => 'require|max:500',
|
|
||||||
'prescription_audit_status' => 'in:0,1,2',
|
|
||||||
'payment_slip_audit_status' => 'in:0,1,2',
|
|
||||||
'prescription_audit_remark' => 'max:500',
|
|
||||||
'payment_slip_audit_remark' => 'max:500',
|
|
||||||
'fulfillment_status' => 'require|integer|in:3,7,8,9,11,12',
|
'fulfillment_status' => 'require|integer|in:3,7,8,9,11,12',
|
||||||
'reason' => 'require|max:500',
|
'reason' => 'require|max:500',
|
||||||
'refund_amount' => 'float|egt:0',
|
'refund_amount' => 'float|egt:0',
|
||||||
@@ -79,7 +74,6 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
'withdraw' => ['id'],
|
'withdraw' => ['id'],
|
||||||
'ship' => ['id', 'tracking_number', 'express_company', 'ship_mode'],
|
'ship' => ['id', 'tracking_number', 'express_company', 'ship_mode'],
|
||||||
'logs' => ['id'],
|
'logs' => ['id'],
|
||||||
'addLog' => ['id', 'summary'],
|
|
||||||
'paidPayOrders' => ['diagnosis_id'],
|
'paidPayOrders' => ['diagnosis_id'],
|
||||||
'addPayOrder' => ['id', 'order_type', 'pay_amount', 'pay_remark'],
|
'addPayOrder' => ['id', 'order_type', 'pay_amount', 'pay_remark'],
|
||||||
'linkPayOrder' => ['id', 'pay_order_id'],
|
'linkPayOrder' => ['id', 'pay_order_id'],
|
||||||
@@ -89,7 +83,6 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
'submitGancaoRecipel' => ['id'],
|
'submitGancaoRecipel' => ['id'],
|
||||||
'previewGancaoRecipel' => ['id'],
|
'previewGancaoRecipel' => ['id'],
|
||||||
'patchPrescriptionPatient' => ['id', 'patient_name', 'phone'],
|
'patchPrescriptionPatient' => ['id', 'patient_name', 'phone'],
|
||||||
'patchPrescriptionUsage' => ['id', 'times_per_day', 'usage_days', 'medication_days', 'aux_times_per_day', 'aux_usage_days'],
|
|
||||||
'updateAmount' => ['id', 'amount'],
|
'updateAmount' => ['id', 'amount'],
|
||||||
'setShipMode' => ['id', 'ship_mode'],
|
'setShipMode' => ['id', 'ship_mode'],
|
||||||
];
|
];
|
||||||
@@ -100,15 +93,4 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
->append('id', 'require|integer|gt:0')
|
->append('id', 'require|integer|gt:0')
|
||||||
->append('amount', 'require|float|egt:0');
|
->append('amount', 'require|float|egt:0');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function patchPrescriptionUsage(): PrescriptionOrderValidate
|
|
||||||
{
|
|
||||||
return $this->only(['id', 'times_per_day', 'usage_days', 'medication_days', 'aux_times_per_day', 'aux_usage_days'])
|
|
||||||
->append('id', 'require|integer|gt:0')
|
|
||||||
->append('times_per_day', 'require|integer|between:1,6')
|
|
||||||
->append('usage_days', 'require|integer|between:1,999')
|
|
||||||
->append('medication_days', 'require|integer|between:1,999')
|
|
||||||
->append('aux_times_per_day', 'integer|between:1,6')
|
|
||||||
->append('aux_usage_days', 'integer|between:1,999');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,658 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace app\command;
|
|
||||||
|
|
||||||
use app\adminapi\logic\dept\DeptLogic;
|
|
||||||
use app\adminapi\logic\stats\RevisitRateLogic;
|
|
||||||
use think\console\Command;
|
|
||||||
use think\console\Input;
|
|
||||||
use think\console\input\Option;
|
|
||||||
use think\console\Output;
|
|
||||||
use think\facade\Db;
|
|
||||||
use think\facade\Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 待分配诊单自动指派（每天定时执行）
|
|
||||||
*
|
|
||||||
* 使用方法：
|
|
||||||
* php think tcm:auto-assign-pending # 正式执行
|
|
||||||
* php think tcm:auto-assign-pending --dry-run # 只演练输出分配计划，不写库
|
|
||||||
*
|
|
||||||
* 推荐 cron（每天 09:00 执行一次；或经 zyt_dev_crontab 表调度）：
|
|
||||||
* 0 9 * * * cd /path/to/server && php think tcm:auto-assign-pending >> /var/log/zyt-auto-assign.log 2>&1
|
|
||||||
*
|
|
||||||
* 分配规则（依据上个自然月「二诊复诊接诊率」，与 RevisitRateLogic::overview 口径完全一致）：
|
|
||||||
* - 接诊率 > 70% ：第一优先档，当日每人最多 3 条
|
|
||||||
* - 接诊率 60% ~ 70% ：第二档，当日每人最多 2 条
|
|
||||||
* - 接诊率 50% ~ 60% ：第三档，当日每人最多 1 条
|
|
||||||
* - 接诊率 < 50% 或上月无被指派数据：不参与分配
|
|
||||||
* - 仅分配给「二中心」及其组织下级部门的在职医助（当前部门校验，调离二中心即不再参与）
|
|
||||||
*
|
|
||||||
* 轮询方式：按轮次分配，每轮内先 >70% 档每人 1 条，再 60%~70% 档每人 1 条，再 50%~60% 档每人 1 条；
|
|
||||||
* 一轮结束还有剩余待指派诊单则进入下一轮，直至待指派池为空或所有医助当日额度用尽。
|
|
||||||
* 例：当天 20 条，>70% 有 3 人、60%~70% 有 7 人、50%~60% 有 5 人 →
|
|
||||||
* 第一轮 3+7+5=15 条；剩余 5 条进第二轮：>70% 再各 1 条（3 条），余 2 条给 60%~70% 档前 2 人。
|
|
||||||
*
|
|
||||||
* 日上限跨执行累计：同一天重复执行命令时，会先从 tcm_diagnosis_auto_assign_log 扣减当日已自动分配数，不会超额。
|
|
||||||
*
|
|
||||||
* 日志：无论分配与否，每条待指派诊单都会写入 tcm_diagnosis_auto_assign_log，记录原因（为什么分配 / 为什么不分配）。
|
|
||||||
* 成功分配同时写 tcm_diagnosis_assign_log（is_inherit=0，计入次月接诊率分母），与手动指派同口径。
|
|
||||||
* 写入时 from_assistant_id 尽量带上「一中心」原医助（指派日志中最近的一中心身份，否则回退业务单创建人若属一中心），避免原医助恒为空。
|
|
||||||
*/
|
|
||||||
class AutoAssignPendingDiagnosis extends Command
|
|
||||||
{
|
|
||||||
/** 档位标识 */
|
|
||||||
private const TIER_GT70 = 'gt70';
|
|
||||||
private const TIER_60_70 = '60_70';
|
|
||||||
private const TIER_50_60 = '50_60';
|
|
||||||
|
|
||||||
/** 各档位当日每人分配上限（按优先级排列，先高档后低档） */
|
|
||||||
private const TIER_DAILY_CAPS = [
|
|
||||||
self::TIER_GT70 => 3,
|
|
||||||
self::TIER_60_70 => 2,
|
|
||||||
self::TIER_50_60 => 1,
|
|
||||||
];
|
|
||||||
|
|
||||||
private const TIER_LABELS = [
|
|
||||||
self::TIER_GT70 => '>70%',
|
|
||||||
self::TIER_60_70 => '60%~70%',
|
|
||||||
self::TIER_50_60 => '50%~60%',
|
|
||||||
];
|
|
||||||
|
|
||||||
protected function configure()
|
|
||||||
{
|
|
||||||
$this->setName('tcm:auto-assign-pending')
|
|
||||||
->setDescription('待分配诊单自动指派：按上月二诊复诊接诊率分档轮询分配，并写入自动指派日志')
|
|
||||||
->addOption('dry-run', null, Option::VALUE_NONE, '演练模式：只输出分配计划，不写库');
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function execute(Input $input, Output $output): int
|
|
||||||
{
|
|
||||||
$now = time();
|
|
||||||
$dryRun = (bool) $input->getOption('dry-run');
|
|
||||||
$runDate = date('Y-m-d', $now);
|
|
||||||
$statMonth = date('Y-m', strtotime(date('Y-m-01', $now) . ' -1 month'));
|
|
||||||
$batchNo = date('YmdHis', $now) . str_pad((string) random_int(0, 9999), 4, '0', STR_PAD_LEFT);
|
|
||||||
|
|
||||||
$output->writeln(sprintf(
|
|
||||||
'[%s] 开始自动指派待分配诊单，批次=%s，统计月=%s%s',
|
|
||||||
date('Y-m-d H:i:s', $now),
|
|
||||||
$batchNo,
|
|
||||||
$statMonth,
|
|
||||||
$dryRun ? '（演练模式，不写库）'
|
|
||||||
: ''
|
|
||||||
));
|
|
||||||
|
|
||||||
try {
|
|
||||||
// 1. 上月二诊复诊接诊率 → 医助分档
|
|
||||||
$tiers = $this->buildAssistantTiers($statMonth);
|
|
||||||
$tierTotal = array_sum(array_map('count', $tiers));
|
|
||||||
$output->writeln(sprintf(
|
|
||||||
'医助分档：>70%% 共 %d 人，60%%~70%% 共 %d 人，50%%~60%% 共 %d 人',
|
|
||||||
\count($tiers[self::TIER_GT70]),
|
|
||||||
\count($tiers[self::TIER_60_70]),
|
|
||||||
\count($tiers[self::TIER_50_60])
|
|
||||||
));
|
|
||||||
|
|
||||||
// 2. 当日剩余额度（扣减当日已自动分配数，防止同日重复执行超额）
|
|
||||||
$remaining = $this->buildRemainingQuota($tiers, $runDate);
|
|
||||||
|
|
||||||
// 3. 待指派池：与「待分配医助」Tab 同口径（assistant_id 空/0 + 当月有业务订单），先到先分
|
|
||||||
[$pool, $ineligible] = $this->fetchPendingPool($now);
|
|
||||||
$output->writeln(sprintf('待指派池：符合条件 %d 条，不符合条件 %d 条', \count($pool), \count($ineligible)));
|
|
||||||
|
|
||||||
$logRows = [];
|
|
||||||
|
|
||||||
// 不符合条件的待指派诊单：不分配，逐条记录原因
|
|
||||||
foreach ($ineligible as $item) {
|
|
||||||
$logRows[] = $this->buildLogRow($batchNo, $runDate, $statMonth, $item['diag'], [
|
|
||||||
'action' => 0,
|
|
||||||
'reason' => $item['reason'],
|
|
||||||
], $now);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($pool === []) {
|
|
||||||
$this->flushLogs($logRows, $dryRun, $output);
|
|
||||||
$output->writeln('待指派池为空，本次无需分配。');
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($tierTotal === 0) {
|
|
||||||
$reason = sprintf('未分配：上月(%s)无二诊复诊接诊率≥50%%的医助，本批次不执行分配', $statMonth);
|
|
||||||
foreach ($pool as $diag) {
|
|
||||||
$logRows[] = $this->buildLogRow($batchNo, $runDate, $statMonth, $diag, [
|
|
||||||
'action' => 0,
|
|
||||||
'reason' => $reason,
|
|
||||||
], $now);
|
|
||||||
}
|
|
||||||
$this->flushLogs($logRows, $dryRun, $output);
|
|
||||||
$output->writeln($reason);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4. 轮询排分配计划
|
|
||||||
[$plan, $leftover] = $this->buildAssignPlan($pool, $tiers, $remaining);
|
|
||||||
|
|
||||||
// 5. 执行计划（逐条事务 + 行锁复核，落库诊单/指派日志/自动指派日志）
|
|
||||||
$assigned = 0;
|
|
||||||
$skipped = 0;
|
|
||||||
foreach ($plan as $item) {
|
|
||||||
if ($dryRun) {
|
|
||||||
$assigned++;
|
|
||||||
$output->writeln(sprintf(
|
|
||||||
'[演练] 诊单#%d(%s) → %s（%s，第%d轮，当日第%d/%d条）',
|
|
||||||
$item['diagnosis']['id'],
|
|
||||||
(string) $item['diagnosis']['patient_name'],
|
|
||||||
$item['assistant']['name'],
|
|
||||||
self::TIER_LABELS[$item['tier']],
|
|
||||||
$item['round'],
|
|
||||||
$item['day_seq'],
|
|
||||||
self::TIER_DAILY_CAPS[$item['tier']]
|
|
||||||
));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$ok = $this->applyAssignment($item, $now);
|
|
||||||
if ($ok) {
|
|
||||||
$assigned++;
|
|
||||||
$logRows[] = $this->buildLogRow($batchNo, $runDate, $statMonth, $item['diagnosis'], [
|
|
||||||
'action' => 1,
|
|
||||||
'assistant_id' => $item['assistant']['id'],
|
|
||||||
'assistant_name' => $item['assistant']['name'],
|
|
||||||
'tier' => $item['tier'],
|
|
||||||
'visit2_rate' => $item['assistant']['rate'],
|
|
||||||
'round_no' => $item['round'],
|
|
||||||
'reason' => sprintf(
|
|
||||||
'已分配给医助[%s](ID:%d)：上月(%s)二诊复诊接诊率 %.2f%%，档位[%s]（日上限%d条），第 %d 轮轮询分得，当日该医助第 %d 条',
|
|
||||||
$item['assistant']['name'],
|
|
||||||
$item['assistant']['id'],
|
|
||||||
$statMonth,
|
|
||||||
$item['assistant']['rate'],
|
|
||||||
self::TIER_LABELS[$item['tier']],
|
|
||||||
self::TIER_DAILY_CAPS[$item['tier']],
|
|
||||||
$item['round'],
|
|
||||||
$item['day_seq']
|
|
||||||
),
|
|
||||||
], $now);
|
|
||||||
} else {
|
|
||||||
$skipped++;
|
|
||||||
$logRows[] = $this->buildLogRow($batchNo, $runDate, $statMonth, $item['diagnosis'], [
|
|
||||||
'action' => 0,
|
|
||||||
'reason' => '未分配：执行时诊单已被指派给其他医助（并发/人工抢先），本次跳过',
|
|
||||||
], $now);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 6. 额度用尽后剩余的待指派诊单：不分配，记录原因
|
|
||||||
foreach ($leftover as $diag) {
|
|
||||||
$logRows[] = $this->buildLogRow($batchNo, $runDate, $statMonth, $diag, [
|
|
||||||
'action' => 0,
|
|
||||||
'reason' => '未分配：各档位医助当日剩余额度已用尽（>70%每人3条、60%~70%每人2条、50%~60%每人1条），顺延至下次执行',
|
|
||||||
], $now);
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->flushLogs($logRows, $dryRun, $output);
|
|
||||||
|
|
||||||
$output->writeln(sprintf(
|
|
||||||
'执行完成。计划分配: %d, 实际分配: %d, 并发跳过: %d, 额度不足未分: %d, 不符合条件: %d',
|
|
||||||
\count($plan),
|
|
||||||
$assigned,
|
|
||||||
$skipped,
|
|
||||||
\count($leftover),
|
|
||||||
\count($ineligible)
|
|
||||||
));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
Log::error('待分配诊单自动指派异常: ' . $e->getMessage() . ' @ ' . $e->getFile() . ':' . $e->getLine());
|
|
||||||
$output->error('执行异常: ' . $e->getMessage());
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 按上月二诊复诊接诊率把医助分档（复用 RevisitRateLogic 口径），并剔除已禁用/已删除账号。
|
|
||||||
*
|
|
||||||
* @return array{gt70: list<array{id:int,name:string,rate:float}>, 60_70: list<array{id:int,name:string,rate:float}>, 50_60: list<array{id:int,name:string,rate:float}>}
|
|
||||||
*/
|
|
||||||
private function buildAssistantTiers(string $statMonth): array
|
|
||||||
{
|
|
||||||
$overview = RevisitRateLogic::overview(['month' => $statMonth]);
|
|
||||||
|
|
||||||
/** @var list<array{id:int,name:string,rate:float}> $candidates */
|
|
||||||
$candidates = [];
|
|
||||||
foreach ($overview['rows'] ?? [] as $deptRow) {
|
|
||||||
foreach ($deptRow['children'] ?? [] as $row) {
|
|
||||||
$aid = (int) ($row['assistant_id'] ?? 0);
|
|
||||||
$rate = $row['visit2_rate'] ?? null;
|
|
||||||
// 上月无被指派数据（rate=null）或接诊率低于 50% 的医助不参与分配
|
|
||||||
if ($aid <= 0 || $rate === null || (float) $rate < 50.0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$candidates[] = [
|
|
||||||
'id' => $aid,
|
|
||||||
'name' => (string) ($row['assistant_name'] ?? ('#' . $aid)),
|
|
||||||
'rate' => (float) $rate,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($candidates === []) {
|
|
||||||
return [self::TIER_GT70 => [], self::TIER_60_70 => [], self::TIER_50_60 => []];
|
|
||||||
}
|
|
||||||
|
|
||||||
// 只分配给当前在职可用的医助账号（role_id=2 且未禁用未删除），
|
|
||||||
// 且当前部门须在「二中心」子树内（统计月在二中心、后来调离的不再参与）
|
|
||||||
$erDeptSet = DeptLogic::getErCenterSubtreeDeptIdSet();
|
|
||||||
if ($erDeptSet === []) {
|
|
||||||
return [self::TIER_GT70 => [], self::TIER_60_70 => [], self::TIER_50_60 => []];
|
|
||||||
}
|
|
||||||
$activeIds = Db::name('admin')
|
|
||||||
->alias('a')
|
|
||||||
->join('admin_role ar', 'a.id = ar.admin_id')
|
|
||||||
->join('admin_dept ad', 'a.id = ad.admin_id')
|
|
||||||
->where('ar.role_id', 2)
|
|
||||||
->where('a.disable', 0)
|
|
||||||
->whereNull('a.delete_time')
|
|
||||||
->whereIn('ad.dept_id', array_keys($erDeptSet))
|
|
||||||
->whereIn('a.id', array_column($candidates, 'id'))
|
|
||||||
->group('a.id')
|
|
||||||
->column('a.id');
|
|
||||||
$activeSet = array_fill_keys(array_map('intval', $activeIds), true);
|
|
||||||
|
|
||||||
$tiers = [self::TIER_GT70 => [], self::TIER_60_70 => [], self::TIER_50_60 => []];
|
|
||||||
foreach ($candidates as $c) {
|
|
||||||
if (!isset($activeSet[$c['id']])) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if ($c['rate'] > 70.0) {
|
|
||||||
$tiers[self::TIER_GT70][] = $c;
|
|
||||||
} elseif ($c['rate'] > 60.0) {
|
|
||||||
$tiers[self::TIER_60_70][] = $c;
|
|
||||||
} else { // 50 <= rate <= 60
|
|
||||||
$tiers[self::TIER_50_60][] = $c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 档内按接诊率降序、id 升序，保证分配顺序确定可复现
|
|
||||||
foreach ($tiers as &$list) {
|
|
||||||
usort($list, static function (array $a, array $b): int {
|
|
||||||
if ($a['rate'] !== $b['rate']) {
|
|
||||||
return $b['rate'] <=> $a['rate'];
|
|
||||||
}
|
|
||||||
|
|
||||||
return $a['id'] <=> $b['id'];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
unset($list);
|
|
||||||
|
|
||||||
return $tiers;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 各医助当日剩余额度 = 档位日上限 - 当日已自动分配条数（同日重复执行不超额）。
|
|
||||||
*
|
|
||||||
* @param array<string, list<array{id:int,name:string,rate:float}>> $tiers
|
|
||||||
*
|
|
||||||
* @return array<int, int> assistant_id => 剩余额度
|
|
||||||
*/
|
|
||||||
private function buildRemainingQuota(array $tiers, string $runDate): array
|
|
||||||
{
|
|
||||||
$usedToday = Db::name('tcm_diagnosis_auto_assign_log')
|
|
||||||
->where('run_date', $runDate)
|
|
||||||
->where('action', 1)
|
|
||||||
->where('assistant_id', '>', 0)
|
|
||||||
->where('rollback_time', 0)
|
|
||||||
->group('assistant_id')
|
|
||||||
->column('COUNT(*)', 'assistant_id');
|
|
||||||
|
|
||||||
$remaining = [];
|
|
||||||
foreach (self::TIER_DAILY_CAPS as $tier => $cap) {
|
|
||||||
foreach ($tiers[$tier] as $assistant) {
|
|
||||||
$used = (int) ($usedToday[$assistant['id']] ?? 0);
|
|
||||||
$remaining[$assistant['id']] = max(0, $cap - $used);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $remaining;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 待指派池：与后台「待分配医助」Tab 同口径 —— assistant_id 为空/0、未删除，
|
|
||||||
* 且当月内存在业务订单（order.patient_id = 诊单 id，Tab 默认按当月过滤）。先到先分。
|
|
||||||
* 返回 [符合条件, 不符合条件（附原因）] 两组；不符合条件的诊单不分配，只记日志。
|
|
||||||
*
|
|
||||||
* @return array{0: list<array<string,mixed>>, 1: list<array{diag:array<string,mixed>,reason:string}>}
|
|
||||||
*/
|
|
||||||
private function fetchPendingPool(int $now): array
|
|
||||||
{
|
|
||||||
$rows = Db::name('tcm_diagnosis')
|
|
||||||
->whereRaw('(assistant_id IS NULL OR assistant_id = 0)')
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->field(['id', 'patient_name', 'phone', 'status', 'create_time'])
|
|
||||||
->order(['create_time' => 'asc', 'id' => 'asc'])
|
|
||||||
->select()
|
|
||||||
->toArray();
|
|
||||||
if ($rows === []) {
|
|
||||||
return [[], []];
|
|
||||||
}
|
|
||||||
|
|
||||||
// 当月存在业务订单的诊单集合（order.create_time 兼容整型时间戳与 datetime 字符串，与 DiagnosisLists 一致）
|
|
||||||
$tStart = (int) strtotime(date('Y-m-01 00:00:00', $now));
|
|
||||||
$tEnd = (int) strtotime(date('Y-m-t 23:59:59', $now));
|
|
||||||
$dsStart = date('Y-m-d H:i:s', $tStart);
|
|
||||||
$dsEnd = date('Y-m-d H:i:s', $tEnd);
|
|
||||||
$hasOrderSet = [];
|
|
||||||
foreach (array_chunk(array_column($rows, 'id'), 2000) as $chunk) {
|
|
||||||
$ids = Db::name('order')
|
|
||||||
->whereIn('patient_id', $chunk)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->where(static function ($q) use ($tStart, $tEnd, $dsStart, $dsEnd) {
|
|
||||||
$q->whereBetween('create_time', [$tStart, $tEnd])
|
|
||||||
->whereOr(static function ($q2) use ($dsStart, $dsEnd) {
|
|
||||||
$q2->where('create_time', '>=', $dsStart)->where('create_time', '<=', $dsEnd);
|
|
||||||
});
|
|
||||||
})
|
|
||||||
->group('patient_id')
|
|
||||||
->column('patient_id');
|
|
||||||
foreach ($ids as $id) {
|
|
||||||
$hasOrderSet[(int) $id] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$curMonth = date('Y-m', $now);
|
|
||||||
$eligible = [];
|
|
||||||
$ineligible = [];
|
|
||||||
foreach ($rows as $r) {
|
|
||||||
$did = (int) ($r['id'] ?? 0);
|
|
||||||
if (!isset($hasOrderSet[$did])) {
|
|
||||||
$ineligible[] = [
|
|
||||||
'diag' => $r,
|
|
||||||
'reason' => sprintf('未分配：诊单当月(%s)无业务订单，不在「待分配医助」列表范围内，不满足自动分配条件', $curMonth),
|
|
||||||
];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if ((int) ($r['status'] ?? 0) !== 1) {
|
|
||||||
$ineligible[] = [
|
|
||||||
'diag' => $r,
|
|
||||||
'reason' => '未分配：诊单未启用（status≠1），不满足自动分配条件',
|
|
||||||
];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$eligible[] = $r;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [$eligible, $ineligible];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 轮询排分配计划：每轮内先 >70% 档每人 1 条，再 60%~70%，再 50%~60%；受各自当日剩余额度约束。
|
|
||||||
*
|
|
||||||
* @param list<array<string,mixed>> $pool 待指派诊单（先到先分）
|
|
||||||
* @param array<string, list<array{id:int,name:string,rate:float}>> $tiers
|
|
||||||
* @param array<int, int> $remaining assistant_id => 剩余额度（会被消耗）
|
|
||||||
*
|
|
||||||
* @return array{
|
|
||||||
* 0: list<array{diagnosis:array<string,mixed>,assistant:array{id:int,name:string,rate:float},tier:string,round:int,day_seq:int}>,
|
|
||||||
* 1: list<array<string,mixed>>
|
|
||||||
* } [分配计划, 额度用尽后剩余诊单]
|
|
||||||
*/
|
|
||||||
private function buildAssignPlan(array $pool, array $tiers, array $remaining): array
|
|
||||||
{
|
|
||||||
$plan = [];
|
|
||||||
$poolIdx = 0;
|
|
||||||
$poolCount = \count($pool);
|
|
||||||
/** @var array<int, int> $daySeq 医助当日已排序号（含历史已用额度） */
|
|
||||||
$daySeq = [];
|
|
||||||
foreach ($remaining as $aid => $left) {
|
|
||||||
// 起始序号 = 日上限 - 剩余额度（同日多次执行时序号衔接）
|
|
||||||
$cap = 0;
|
|
||||||
foreach (self::TIER_DAILY_CAPS as $tier => $tierCap) {
|
|
||||||
foreach ($tiers[$tier] as $assistant) {
|
|
||||||
if ($assistant['id'] === $aid) {
|
|
||||||
$cap = $tierCap;
|
|
||||||
break 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$daySeq[$aid] = $cap - $left;
|
|
||||||
}
|
|
||||||
|
|
||||||
$round = 0;
|
|
||||||
while ($poolIdx < $poolCount) {
|
|
||||||
$round++;
|
|
||||||
$assignedThisRound = 0;
|
|
||||||
foreach (self::TIER_DAILY_CAPS as $tier => $_cap) {
|
|
||||||
foreach ($tiers[$tier] as $assistant) {
|
|
||||||
if ($poolIdx >= $poolCount) {
|
|
||||||
break 2;
|
|
||||||
}
|
|
||||||
$aid = $assistant['id'];
|
|
||||||
if (($remaining[$aid] ?? 0) <= 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$remaining[$aid]--;
|
|
||||||
$daySeq[$aid]++;
|
|
||||||
$plan[] = [
|
|
||||||
'diagnosis' => $pool[$poolIdx],
|
|
||||||
'assistant' => $assistant,
|
|
||||||
'tier' => $tier,
|
|
||||||
'round' => $round,
|
|
||||||
'day_seq' => $daySeq[$aid],
|
|
||||||
];
|
|
||||||
$poolIdx++;
|
|
||||||
$assignedThisRound++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($assignedThisRound === 0) {
|
|
||||||
// 所有医助额度用尽，剩余诊单不再分配
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [$plan, \array_slice($pool, $poolIdx)];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 落库单条分配：事务 + 行锁复核诊单仍未指派，更新诊单并写指派日志（与手动指派 DiagnosisLogic::assign 同口径）。
|
|
||||||
*
|
|
||||||
* @param array{diagnosis:array<string,mixed>,assistant:array{id:int,name:string,rate:float}} $item
|
|
||||||
*/
|
|
||||||
private function applyAssignment(array $item, int $now): bool
|
|
||||||
{
|
|
||||||
$diagnosisId = (int) $item['diagnosis']['id'];
|
|
||||||
$toAssistantId = (int) $item['assistant']['id'];
|
|
||||||
|
|
||||||
Db::startTrans();
|
|
||||||
try {
|
|
||||||
$diagLock = Db::name('tcm_diagnosis')
|
|
||||||
->where('id', $diagnosisId)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->lock(true)
|
|
||||||
->field(['id', 'assistant_id'])
|
|
||||||
->find();
|
|
||||||
if ($diagLock === null || $diagLock === [] || (int) ($diagLock['assistant_id'] ?? 0) > 0) {
|
|
||||||
Db::rollback();
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Db::name('tcm_diagnosis')
|
|
||||||
->where('id', $diagnosisId)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->update([
|
|
||||||
'assistant_id' => $toAssistantId,
|
|
||||||
'assign_read_at' => null,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$poSnap = Db::name('tcm_prescription_order')
|
|
||||||
->where('diagnosis_id', $diagnosisId)
|
|
||||||
->whereNull('delete_time')
|
|
||||||
->order(['create_time' => 'desc', 'id' => 'desc'])
|
|
||||||
->field(['creator_id', 'create_time'])
|
|
||||||
->find();
|
|
||||||
$relatedPoCreatorId = (int) ($poSnap['creator_id'] ?? 0);
|
|
||||||
$relatedPoCreateTime = (int) ($poSnap['create_time'] ?? 0);
|
|
||||||
if ($relatedPoCreateTime <= 0) {
|
|
||||||
$relatedPoCreateTime = $now;
|
|
||||||
$relatedPoCreatorId = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 自动分给二中心时，原医助带上一中心身份（列表「原医助」不再恒为空）
|
|
||||||
$fromAssistantId = $this->resolveYiCenterPreviousAssistantId($diagnosisId, $relatedPoCreatorId);
|
|
||||||
|
|
||||||
Db::name('tcm_diagnosis_assign_log')->insert([
|
|
||||||
'diagnosis_id' => $diagnosisId,
|
|
||||||
'from_assistant_id' => $fromAssistantId,
|
|
||||||
'to_assistant_id' => $toAssistantId,
|
|
||||||
'operator_admin_id' => 0,
|
|
||||||
'operator_name' => '系统自动分配',
|
|
||||||
'operator_account' => 'system',
|
|
||||||
'ip' => '',
|
|
||||||
'related_po_creator_id' => $relatedPoCreatorId,
|
|
||||||
'related_po_create_time' => $relatedPoCreateTime,
|
|
||||||
'is_inherit' => 0,
|
|
||||||
'create_time' => $now,
|
|
||||||
]);
|
|
||||||
|
|
||||||
Db::commit();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
Db::rollback();
|
|
||||||
Log::error(sprintf('自动指派落库失败 diagnosis_id=%d assistant_id=%d msg=%s', $diagnosisId, $toAssistantId, $e->getMessage()));
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 解析诊单对应的「一中心」原医助 id，供自动指派写入 from_assistant_id。
|
|
||||||
* 优先：指派日志由新到旧，取最近出现的一中心身份（先 to 后 from）；
|
|
||||||
* 回退：最新业务单创建人若属一中心则用之。跳过二中心身份，避免原医助写成上一任二中心。
|
|
||||||
*/
|
|
||||||
private function resolveYiCenterPreviousAssistantId(int $diagnosisId, int $relatedPoCreatorId): int
|
|
||||||
{
|
|
||||||
if ($diagnosisId <= 0) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
$yiDeptSet = DeptLogic::getYiCenterSubtreeDeptIdSet();
|
|
||||||
if ($yiDeptSet === []) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$logs = Db::name('tcm_diagnosis_assign_log')
|
|
||||||
->where('diagnosis_id', $diagnosisId)
|
|
||||||
->order('id', 'desc')
|
|
||||||
->field(['from_assistant_id', 'to_assistant_id'])
|
|
||||||
->select()
|
|
||||||
->toArray();
|
|
||||||
|
|
||||||
$candidateIds = [];
|
|
||||||
foreach ($logs as $log) {
|
|
||||||
$to = (int) ($log['to_assistant_id'] ?? 0);
|
|
||||||
$from = (int) ($log['from_assistant_id'] ?? 0);
|
|
||||||
if ($to > 0) {
|
|
||||||
$candidateIds[] = $to;
|
|
||||||
}
|
|
||||||
if ($from > 0) {
|
|
||||||
$candidateIds[] = $from;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($relatedPoCreatorId > 0) {
|
|
||||||
$candidateIds[] = $relatedPoCreatorId;
|
|
||||||
}
|
|
||||||
$candidateIds = array_values(array_unique(array_filter($candidateIds)));
|
|
||||||
if ($candidateIds === []) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$yiAdminSet = $this->filterAdminIdsInDeptSet($candidateIds, $yiDeptSet);
|
|
||||||
if ($yiAdminSet === []) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($logs as $log) {
|
|
||||||
$to = (int) ($log['to_assistant_id'] ?? 0);
|
|
||||||
if ($to > 0 && isset($yiAdminSet[$to])) {
|
|
||||||
return $to;
|
|
||||||
}
|
|
||||||
$from = (int) ($log['from_assistant_id'] ?? 0);
|
|
||||||
if ($from > 0 && isset($yiAdminSet[$from])) {
|
|
||||||
return $from;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($relatedPoCreatorId > 0 && isset($yiAdminSet[$relatedPoCreatorId])) {
|
|
||||||
return $relatedPoCreatorId;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param list<int> $adminIds
|
|
||||||
* @param array<int, true> $deptIdSet
|
|
||||||
*
|
|
||||||
* @return array<int, true> admin_id => true
|
|
||||||
*/
|
|
||||||
private function filterAdminIdsInDeptSet(array $adminIds, array $deptIdSet): array
|
|
||||||
{
|
|
||||||
if ($adminIds === [] || $deptIdSet === []) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
$rows = Db::name('admin_dept')
|
|
||||||
->whereIn('admin_id', $adminIds)
|
|
||||||
->whereIn('dept_id', array_keys($deptIdSet))
|
|
||||||
->column('admin_id');
|
|
||||||
|
|
||||||
return array_fill_keys(array_map('intval', $rows), true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param array<string,mixed> $diag 诊单行（含 id/patient_name/phone）
|
|
||||||
* @param array<string,mixed> $extra action/assistant_id/assistant_name/tier/visit2_rate/round_no/reason
|
|
||||||
*
|
|
||||||
* @return array<string,mixed>
|
|
||||||
*/
|
|
||||||
private function buildLogRow(string $batchNo, string $runDate, string $statMonth, array $diag, array $extra, int $now): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'batch_no' => $batchNo,
|
|
||||||
'run_date' => $runDate,
|
|
||||||
'stat_month' => $statMonth,
|
|
||||||
'diagnosis_id' => (int) ($diag['id'] ?? 0),
|
|
||||||
'patient_name' => mb_substr(trim((string) ($diag['patient_name'] ?? '')), 0, 64),
|
|
||||||
'patient_phone' => mb_substr(trim((string) ($diag['phone'] ?? '')), 0, 32),
|
|
||||||
'action' => (int) ($extra['action'] ?? 0),
|
|
||||||
'assistant_id' => (int) ($extra['assistant_id'] ?? 0),
|
|
||||||
'assistant_name' => mb_substr((string) ($extra['assistant_name'] ?? ''), 0, 64),
|
|
||||||
'tier' => (string) ($extra['tier'] ?? ''),
|
|
||||||
'visit2_rate' => $extra['visit2_rate'] ?? null,
|
|
||||||
'round_no' => (int) ($extra['round_no'] ?? 0),
|
|
||||||
'reason' => mb_substr((string) ($extra['reason'] ?? ''), 0, 500),
|
|
||||||
'create_time' => $now,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param list<array<string,mixed>> $logRows
|
|
||||||
*/
|
|
||||||
private function flushLogs(array $logRows, bool $dryRun, Output $output): void
|
|
||||||
{
|
|
||||||
if ($logRows === []) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if ($dryRun) {
|
|
||||||
$output->writeln(sprintf('[演练] 应写入自动指派日志 %d 条（未落库）', \count($logRows)));
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
foreach (array_chunk($logRows, 500) as $chunk) {
|
|
||||||
Db::name('tcm_diagnosis_auto_assign_log')->insertAll($chunk);
|
|
||||||
}
|
|
||||||
$output->writeln(sprintf('已写入自动指派日志 %d 条', \count($logRows)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,7 @@ use think\console\Output;
|
|||||||
* 配置 crontab（每 10 分钟）：拉快递 100 + 按履约「已发货」核对释放诊单医助（跳过已完成/已签收业务单，与是否甘草单无关）
|
* 配置 crontab（每 10 分钟）：拉快递 100 + 按履约「已发货」核对释放诊单医助（跳过已完成/已签收业务单，与是否甘草单无关）
|
||||||
* 0,10,20,30,40,50 * * * * cd /path/to/server && php think express:auto-update >> /dev/null 2>&1
|
* 0,10,20,30,40,50 * * * * cd /path/to/server && php think express:auto-update >> /dev/null 2>&1
|
||||||
*
|
*
|
||||||
* 已对「待释放医助非二中心」执行发货/签收自动释放的诊单会写入 tcm_diagnosis.shipped_non_er_assistant_cleared_at，
|
* 已对「业务订单创建人非二中心」（或创建人为开方医生时按待释放身份判定）执行发货/签收自动释放的诊单会写入 tcm_diagnosis.shipped_non_er_assistant_cleared_at，
|
||||||
* 后续履约核对不再重复扫描（需先执行 sql/1.9.20260507/add_diagnosis_shipped_non_er_assistant_cleared_at.sql）。
|
* 后续履约核对不再重复扫描（需先执行 sql/1.9.20260507/add_diagnosis_shipped_non_er_assistant_cleared_at.sql）。
|
||||||
*/
|
*/
|
||||||
class ExpressAutoUpdate extends Command
|
class ExpressAutoUpdate extends Command
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ use think\console\Output;
|
|||||||
* 0,30 * * * * cd /path/to/server && php think gancao:sync-logistics >> runtime/log/gancao_sync.log 2>&1
|
* 0,30 * * * * cd /path/to/server && php think gancao:sync-logistics >> runtime/log/gancao_sync.log 2>&1
|
||||||
*
|
*
|
||||||
* 跳过履约状态为已完成(3)、已签收(6) 的业务订单，不再拉取甘草路由。
|
* 跳过履约状态为已完成(3)、已签收(6) 的业务订单，不再拉取甘草路由。
|
||||||
* 已对「待释放医助非二中心」（发货/签收自动释放规则见 ExpressTrackingService）的诊单会写入 tcm_diagnosis.shipped_non_er_assistant_cleared_at，
|
* 已对「业务订单创建人非二中心」（发货/签收自动释放规则见 ExpressTrackingService）的诊单会写入 tcm_diagnosis.shipped_non_er_assistant_cleared_at，
|
||||||
* 后续履约核对不再重复扫描（需先执行 sql/1.9.20260507/add_diagnosis_shipped_non_er_assistant_cleared_at.sql）。
|
* 后续履约核对不再重复扫描（需先执行 sql/1.9.20260507/add_diagnosis_shipped_non_er_assistant_cleared_at.sql）。
|
||||||
*/
|
*/
|
||||||
class GancaoSyncLogisticsRoute extends Command
|
class GancaoSyncLogisticsRoute extends Command
|
||||||
|
|||||||
@@ -588,7 +588,7 @@ class ExpressTrackingService
|
|||||||
/**
|
/**
|
||||||
* 处方业务订单履约「已发货(5) / 已签收(6)」时：清空关联诊单（患者）医助，并写入 tcm_diagnosis_assign_log（含关联业务订单 creator_id / create_time 快照，便于核对医助创建订单时间）。
|
* 处方业务订单履约「已发货(5) / 已签收(6)」时：清空关联诊单（患者）医助，并写入 tcm_diagnosis_assign_log（含关联业务订单 creator_id / create_time 快照，便于核对医助创建订单时间）。
|
||||||
* 快递 100 定时拉轨迹、甘草路由、甘草回调与履约核对共用同一规则。
|
* 快递 100 定时拉轨迹、甘草路由、甘草回调与履约核对共用同一规则。
|
||||||
* 不自动清空的情形：（1）待释放医助（诊单 assistant_id，或代建回退身份）归属「二中心」部门子树；（2）诊单当前已指派、或指派日志曾 to 给「二中心」医助（含系统自动分配）；（3）诊单已有 shipped_non_er_assistant_cleared_at 且 assistant_id 已为 0（视为已处理）；（4）指派日志存在后台人工指派：`operator_admin_id>0` 且 `to_assistant_id>0`；或 related_po_creator_id=from_assistant_id 且 to>0 的旧数据兼容。避免「系统·已发货履约核对」覆盖人工指派链。
|
* 不自动清空的情形：（1）按业务订单 creator_id（代建场景）或回退身份判断是否在「二中心」部门子树；（2）诊单已有 shipped_non_er_assistant_cleared_at 且 assistant_id 已为 0（视为已处理）；（3）指派日志存在后台人工指派：`operator_admin_id>0` 且 `to_assistant_id>0`（系统任务为 operator_admin_id=0）；或 related_po_creator_id=from_assistant_id 且 to>0 的旧数据兼容。避免「系统·已发货履约核对」覆盖人工指派链。
|
||||||
*
|
*
|
||||||
* @param array{tracking_id?:int,tracking_number?:string,source?:string} $meta
|
* @param array{tracking_id?:int,tracking_number?:string,source?:string} $meta
|
||||||
* @return array{
|
* @return array{
|
||||||
@@ -663,18 +663,19 @@ class ExpressTrackingService
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 二中心不释放：（a）待释放医助属二中心；（b）诊单当前医助属二中心；（c）指派日志曾指派给二中心医助
|
/** 是否因「二中心」跳过释放：优先看业务订单创建人 creator_id（代建场景）；创建人即开方医生时用 fromAssistantId */
|
||||||
$skipErzhongxin = self::currentAssistantBelongsToErzhongxinDeptTree($fromAssistantId)
|
$erZhongxinCheckAdminId = ($poCreatorId > 0 && ($rxId <= 0 || $poCreatorId !== $rxCreator))
|
||||||
|| ($diagAssistantIdNow > 0 && self::currentAssistantBelongsToErzhongxinDeptTree($diagAssistantIdNow))
|
? $poCreatorId
|
||||||
|| self::diagnosisHasBeenAssignedToErzhongxinAssistant($diagnosisId);
|
: $fromAssistantId;
|
||||||
if ($skipErzhongxin) {
|
|
||||||
Log::info('Skipped auto assistant release (shipped/signed): 二中心 assistant assigned or targeted', [
|
if ($erZhongxinCheckAdminId > 0 && self::currentAssistantBelongsToErzhongxinDeptTree($erZhongxinCheckAdminId)) {
|
||||||
|
Log::info('Skipped auto assistant release (shipped/signed): order creator (or fallback from-id) under 二中心 dept tree', [
|
||||||
'diagnosis_id' => $diagnosisId,
|
'diagnosis_id' => $diagnosisId,
|
||||||
'prescription_order_id' => $orderId,
|
'prescription_order_id' => $orderId,
|
||||||
'source' => $source,
|
'source' => $source,
|
||||||
'from_assistant_id' => $fromAssistantId,
|
'er_zhongxin_check_admin_id' => $erZhongxinCheckAdminId,
|
||||||
'diagnosis_assistant_id' => $diagAssistantIdNow,
|
'prescription_order_creator_id' => $poCreatorId,
|
||||||
'prescription_order_creator_id' => $poCreatorId,
|
'from_assistant_id_for_log' => $fromAssistantId,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
@@ -797,36 +798,6 @@ class ExpressTrackingService
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 诊单指派日志是否曾指派给「二中心」医助（to_assistant_id>0，含人工指派与系统自动分配）。
|
|
||||||
*/
|
|
||||||
private static function diagnosisHasBeenAssignedToErzhongxinAssistant(int $diagnosisId): bool
|
|
||||||
{
|
|
||||||
if ($diagnosisId <= 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$toIds = Db::name('tcm_diagnosis_assign_log')
|
|
||||||
->where('diagnosis_id', $diagnosisId)
|
|
||||||
->where('to_assistant_id', '>', 0)
|
|
||||||
->column('to_assistant_id');
|
|
||||||
if ($toIds === [] || $toIds === null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$seen = [];
|
|
||||||
foreach ($toIds as $aid) {
|
|
||||||
$aid = (int) $aid;
|
|
||||||
if ($aid <= 0 || isset($seen[$aid])) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$seen[$aid] = true;
|
|
||||||
if (self::currentAssistantBelongsToErzhongxinDeptTree($aid)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 若诊单曾被后台人工指派到具体医助，则不再执行发运/签收自动清空（避免「系统·已发货履约核对」覆盖人工链）。
|
* 若诊单曾被后台人工指派到具体医助，则不再执行发运/签收自动清空（避免「系统·已发货履约核对」覆盖人工链）。
|
||||||
* 判定：operator_admin_id>0 且 to_assistant_id>0（人工）；系统写入的释放/同步为 operator_admin_id=0。
|
* 判定：operator_admin_id>0 且 to_assistant_id>0（人工）；系统写入的释放/同步为 operator_admin_id=0。
|
||||||
@@ -1060,7 +1031,7 @@ class ExpressTrackingService
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 按处方订单履约核对：仅已发货(5) 时符合条件的订单调用 applyAssistantReleaseForShippedPrescriptionOrder（已完成/已签收不再扫描）。
|
* 按处方订单履约核对：仅已发货(5) 时符合条件的订单调用 applyAssistantReleaseForShippedPrescriptionOrder（已完成/已签收不再扫描）。
|
||||||
* 与快递 100 / 甘草来自哪个物流渠道无关；是否清空医助以该方法为准（**二中心豁免看待释放医助**参见 apply；已 shipped 释放且 assistant_id=0 视为已处理）。
|
* 与快递 100 / 甘草来自哪个物流渠道无关；是否清空医助以该方法为准（**二中心豁免看业务单创建人**参见 apply；已 shipped 释放且 assistant_id=0 视为已处理）。
|
||||||
*
|
*
|
||||||
* @return array{scanned: int, cleared: int, lines: list<string>}
|
* @return array{scanned: int, cleared: int, lines: list<string>}
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -40,7 +40,5 @@ return [
|
|||||||
'migrate:images-to-doctor-note' => 'app\\command\\MigrateImagesToDoctorNote',
|
'migrate:images-to-doctor-note' => 'app\\command\\MigrateImagesToDoctorNote',
|
||||||
// 诊单待办事项：扫描到点的待执行项并向创建人发送企业微信消息
|
// 诊单待办事项：扫描到点的待执行项并向创建人发送企业微信消息
|
||||||
'tcm:diagnosis-todo-notify' => 'app\\command\\DiagnosisTodoNotify',
|
'tcm:diagnosis-todo-notify' => 'app\\command\\DiagnosisTodoNotify',
|
||||||
// 待分配诊单自动指派：按上月二诊复诊接诊率分档轮询分配（>70% 3条/60~70% 2条/50~60% 1条），写自动指派日志
|
|
||||||
'tcm:auto-assign-pending' => 'app\\command\\AutoAssignPendingDiagnosis',
|
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB |
+1
-1
@@ -1 +1 @@
|
|||||||
import r from"./error-D7g_31ON.js";import{f as p,ak as i,I as m,a as e,aN as s,J as o}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Bolc0EfP.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/shared-mAAVTE9n.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-B0jSCQ-G.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./vue-router-QlpZ4wdW.js";import"./index-DiYdpaIG.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const a="/admin/assets/no_perms-jDxcYpYC.png",n={class:"error404"},W=p({__name:"403",setup(c){return(_,t)=>(i(),m("div",n,[e(r,{code:"403",title:"您的账号权限不足，请联系管理员添加权限！","show-btn":!1},{content:s(()=>[...t[0]||(t[0]=[o("div",{class:"flex justify-center"},[o("img",{class:"w-[150px] h-[150px]",src:a,alt:""})],-1)])]),_:1})]))}});export{W as default};
|
import r from"./error-BUBKvVs4.js";import{f as p,ak as i,I as m,a as e,aN as s,J as o}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Bolc0EfP.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/shared-mAAVTE9n.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-B0jSCQ-G.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./vue-router-QlpZ4wdW.js";import"./index-B6p-ZV3k.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const a="/admin/assets/no_perms-jDxcYpYC.png",n={class:"error404"},W=p({__name:"403",setup(c){return(_,t)=>(i(),m("div",n,[e(r,{code:"403",title:"您的账号权限不足，请联系管理员添加权限！","show-btn":!1},{content:s(()=>[...t[0]||(t[0]=[o("div",{class:"flex justify-center"},[o("img",{class:"w-[150px] h-[150px]",src:a,alt:""})],-1)])]),_:1})]))}});export{W as default};
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
import o from"./error-D7g_31ON.js";import{f as r,ak as t,I as m,a as p}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Bolc0EfP.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/shared-mAAVTE9n.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-B0jSCQ-G.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./vue-router-QlpZ4wdW.js";import"./index-DiYdpaIG.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const i={class:"error404"},T=r({__name:"404",setup(e){return(a,s)=>(t(),m("div",i,[p(o,{code:"404",title:"哎呀，出错了！您访问的页面不存在…"})]))}});export{T as default};
|
import o from"./error-BUBKvVs4.js";import{f as r,ak as t,I as m,a as p}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Bolc0EfP.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/shared-mAAVTE9n.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-B0jSCQ-G.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./vue-router-QlpZ4wdW.js";import"./index-B6p-ZV3k.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const i={class:"error404"},T=r({__name:"404",setup(e){return(a,s)=>(t(),m("div",i,[p(o,{code:"404",title:"哎呀，出错了！您访问的页面不存在…"})]))}});export{T as default};
|
||||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
|||||||
import{M as T,N as C,T as $,r as D,d as L,L as k}from"./element-plus-Bolc0EfP.js";import{Y as E}from"./@element-plus/icons-vue-B0jSCQ-G.js";import{a8 as P}from"./tcm-B_U8CrQ9.js";import{f as A,w as B,ak as p,I as b,aP as F,G as h,aN as n,a as i,O as m,J as M}from"./@vue/runtime-core-C6bnekPw.js";import{Q as c}from"./@vue/shared-mAAVTE9n.js";import{y as V,n as w}from"./@vue/reactivity-DiY1c2vO.js";import{_ as K}from"./index-DiYdpaIG.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./vue-router-QlpZ4wdW.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const Y={class:"assign-log-panel"},q={key:1,class:"text-gray-400"},z=A({__name:"AssignLogPanel",props:{diagnosisId:{}},setup(N,{expose:v}){const _=N,d=w(!1),u=w([]);function y(o){const e=o.related_po_creator_name;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(o.related_po_creator_id);return Number.isFinite(t)&&t>0?`ID:${t}`:"—"}function x(o){const e=o.related_po_create_time_text;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(o.related_po_create_time);if(!Number.isFinite(t)||t<=0)return"—";const a=new Date(t*1e3);if(Number.isNaN(a.getTime()))return"—";const r=l=>String(l).padStart(2,"0");return`${a.getFullYear()}-${r(a.getMonth()+1)}-${r(a.getDate())} ${r(a.getHours())}:${r(a.getMinutes())}:${r(a.getSeconds())}`}function f(o,e){const t=e==="from"?"from_assistant_name":"to_assistant_name",a=e==="from"?"from_assistant_id":"to_assistant_id",r=o[t];if(r!=null&&String(r).trim()!==""&&String(r)!=="—")return String(r);const l=Number(o[a]);return Number.isFinite(l)&&l>0?`ID:${l}`:"—"}const g=async()=>{if(_.diagnosisId){d.value=!0;try{const o=await P({id:_.diagnosisId}),e=Array.isArray(o)?o:[];u.value=e}catch(o){console.error(o),u.value=[]}finally{d.value=!1}}};return B(()=>_.diagnosisId,()=>{g()},{immediate:!0}),v({refresh:g}),(o,e)=>{const t=C,a=$,r=L,l=D,S=T,I=k;return p(),b("div",Y,[F((p(),h(S,{data:u.value,border:"",stripe:"","empty-text":"暂无指派记录"},{default:n(()=>[i(t,{label:"操作时间",width:"175",prop:"create_time_text"}),i(t,{label:"原医助","min-width":"120"},{default:n(({row:s})=>[m(c(f(s,"from")),1)]),_:1}),i(t,{label:"新医助","min-width":"120"},{default:n(({row:s})=>[m(c(f(s,"to")),1)]),_:1}),i(t,{label:"继承",width:"72",align:"center"},{default:n(({row:s})=>[Number(s.is_inherit)===1?(p(),h(a,{key:0,type:"success",size:"small"},{default:n(()=>[...e[0]||(e[0]=[m("是",-1)])]),_:1})):(p(),b("span",q,"否"))]),_:1}),i(t,{label:"快照·业务单创建人","min-width":"130","show-overflow-tooltip":""},{default:n(({row:s})=>[m(c(y(s)),1)]),_:1}),i(t,{label:"快照·业务单创建时间",width:"190"},{header:n(()=>[e[1]||(e[1]=M("span",null,"快照·业务单创建时间",-1)),i(l,{placement:"top",content:"related_po_create_time：触发本次操作的处方业务订单 create_time；与原文助一致时表示医助创建订单时间"},{default:n(()=>[i(r,{class:"assign-log-col-hint"},{default:n(()=>[i(V(E))]),_:1})]),_:1})]),default:n(({row:s})=>[m(c(x(s)),1)]),_:1}),i(t,{label:"操作人",width:"110",prop:"operator_name"}),i(t,{label:"操作账号",width:"120",prop:"operator_account","show-overflow-tooltip":""}),i(t,{label:"IP",width:"130",prop:"ip","show-overflow-tooltip":""})]),_:1},8,["data"])),[[I,d.value]])])}}}),Ct=K(z,[["__scopeId","data-v-f670e3e6"]]);export{Ct as default};
|
import{M as T,N as C,T as $,r as D,d as L,L as k}from"./element-plus-Bolc0EfP.js";import{Y as E}from"./@element-plus/icons-vue-B0jSCQ-G.js";import{a6 as P}from"./tcm-Ba4j6pRH.js";import{f as A,w as B,ak as p,I as b,aP as F,G as h,aN as n,a as i,O as m,J as M}from"./@vue/runtime-core-C6bnekPw.js";import{Q as c}from"./@vue/shared-mAAVTE9n.js";import{y as V,n as w}from"./@vue/reactivity-DiY1c2vO.js";import{_ as K}from"./index-B6p-ZV3k.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./vue-router-QlpZ4wdW.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const Y={class:"assign-log-panel"},q={key:1,class:"text-gray-400"},z=A({__name:"AssignLogPanel",props:{diagnosisId:{}},setup(N,{expose:v}){const _=N,d=w(!1),u=w([]);function y(o){const e=o.related_po_creator_name;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(o.related_po_creator_id);return Number.isFinite(t)&&t>0?`ID:${t}`:"—"}function x(o){const e=o.related_po_create_time_text;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(o.related_po_create_time);if(!Number.isFinite(t)||t<=0)return"—";const a=new Date(t*1e3);if(Number.isNaN(a.getTime()))return"—";const r=l=>String(l).padStart(2,"0");return`${a.getFullYear()}-${r(a.getMonth()+1)}-${r(a.getDate())} ${r(a.getHours())}:${r(a.getMinutes())}:${r(a.getSeconds())}`}function f(o,e){const t=e==="from"?"from_assistant_name":"to_assistant_name",a=e==="from"?"from_assistant_id":"to_assistant_id",r=o[t];if(r!=null&&String(r).trim()!==""&&String(r)!=="—")return String(r);const l=Number(o[a]);return Number.isFinite(l)&&l>0?`ID:${l}`:"—"}const g=async()=>{if(_.diagnosisId){d.value=!0;try{const o=await P({id:_.diagnosisId}),e=Array.isArray(o)?o:[];u.value=e}catch(o){console.error(o),u.value=[]}finally{d.value=!1}}};return B(()=>_.diagnosisId,()=>{g()},{immediate:!0}),v({refresh:g}),(o,e)=>{const t=C,a=$,r=L,l=D,S=T,I=k;return p(),b("div",Y,[F((p(),h(S,{data:u.value,border:"",stripe:"","empty-text":"暂无指派记录"},{default:n(()=>[i(t,{label:"操作时间",width:"175",prop:"create_time_text"}),i(t,{label:"原医助","min-width":"120"},{default:n(({row:s})=>[m(c(f(s,"from")),1)]),_:1}),i(t,{label:"新医助","min-width":"120"},{default:n(({row:s})=>[m(c(f(s,"to")),1)]),_:1}),i(t,{label:"继承",width:"72",align:"center"},{default:n(({row:s})=>[Number(s.is_inherit)===1?(p(),h(a,{key:0,type:"success",size:"small"},{default:n(()=>[...e[0]||(e[0]=[m("是",-1)])]),_:1})):(p(),b("span",q,"否"))]),_:1}),i(t,{label:"快照·业务单创建人","min-width":"130","show-overflow-tooltip":""},{default:n(({row:s})=>[m(c(y(s)),1)]),_:1}),i(t,{label:"快照·业务单创建时间",width:"190"},{header:n(()=>[e[1]||(e[1]=M("span",null,"快照·业务单创建时间",-1)),i(l,{placement:"top",content:"related_po_create_time：触发本次操作的处方业务订单 create_time；与原文助一致时表示医助创建订单时间"},{default:n(()=>[i(r,{class:"assign-log-col-hint"},{default:n(()=>[i(V(E))]),_:1})]),_:1})]),default:n(({row:s})=>[m(c(x(s)),1)]),_:1}),i(t,{label:"操作人",width:"110",prop:"operator_name"}),i(t,{label:"操作账号",width:"120",prop:"operator_account","show-overflow-tooltip":""}),i(t,{label:"IP",width:"130",prop:"ip","show-overflow-tooltip":""})]),_:1},8,["data"])),[[I,d.value]])])}}}),Ct=K(z,[["__scopeId","data-v-f670e3e6"]]);export{Ct as default};
|
||||||
+1
-1
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user