Commit 7e6184bdc04d721fffc35d87f90dcd76fed53746
1 parent
25cad2d3
1
Showing
473 changed files
with
26293 additions
and
2762 deletions
Too many changes.
To preserve performance only 100 of 473 files are displayed.
Antis.Erp.Plat/.cursor/rules/project_rules.mdc
| @@ -144,6 +144,7 @@ Id = Guid.NewGuid().ToString() | @@ -144,6 +144,7 @@ Id = Guid.NewGuid().ToString() | ||
| 144 | - 禁止在主页面的 template 中直接编写弹窗内容或复杂交互逻辑 | 144 | - 禁止在主页面的 template 中直接编写弹窗内容或复杂交互逻辑 |
| 145 | - 组件文件命名使用 kebab-case,如:user-dialog.vue、edit-form.vue | 145 | - 组件文件命名使用 kebab-case,如:user-dialog.vue、edit-form.vue |
| 146 | - 列表数据不能换行 | 146 | - 列表数据不能换行 |
| 147 | +- **弹窗/抽屉挂 body**:所有 `el-dialog`、`el-drawer` 必须 `append-to-body`(建议同时 `modal-append-to-body`);页内多选项卡切换时应关闭未关弹窗,避免遮罩错位。详见规则 `wt-dialog-append-to-body.mdc` | ||
| 147 | 148 | ||
| 148 | ### 后端特殊要求 | 149 | ### 后端特殊要求 |
| 149 | - 使用 WhereIF 条件查询避免 SQL 注入 | 150 | - 使用 WhereIF 条件查询避免 SQL 注入 |
| @@ -180,5 +181,6 @@ Id = Guid.NewGuid().ToString() | @@ -180,5 +181,6 @@ Id = Guid.NewGuid().ToString() | ||
| 180 | 9. **数据库文档**: 所有数据库表结构、字段说明、关联关系必须记录到 `项目文档相关/docs/数据库说明.md` | 181 | 9. **数据库文档**: 所有数据库表结构、字段说明、关联关系必须记录到 `项目文档相关/docs/数据库说明.md` |
| 181 | 10. **ID生成规范**: 所有实体ID的生成都必须使用 `YitIdHelper.NextId().ToString()`,禁止使用 `Guid.NewGuid().ToString()` 或其他ID生成方式 | 182 | 10. **ID生成规范**: 所有实体ID的生成都必须使用 `YitIdHelper.NextId().ToString()`,禁止使用 `Guid.NewGuid().ToString()` 或其他ID生成方式 |
| 182 | 11.**说明文档规范**:没有要求生成新的md文件的时候,严禁生成新md文件。 | 183 | 11.**说明文档规范**:没有要求生成新的md文件的时候,严禁生成新md文件。 |
| 184 | +12. **弹窗/抽屉 append-to-body**:`antis-ncc-admin` 中新增或修改的 `el-dialog` / `el-drawer` 必须挂到 `body`(`append-to-body`),与壳层多页签遮罩(`tagsViewPopupScope` / `modern-shell`)对齐;禁止省略或设为 `false`(有嵌套层特殊理由须注释说明)。 | ||
| 183 | 185 | ||
| 184 | ## 📋 重要变更记录 | 186 | ## 📋 重要变更记录 |
Antis.Erp.Plat/.cursor/rules/wt-dialog-append-to-body.mdc
0 → 100644
| 1 | +--- | ||
| 2 | +description: el-dialog / el-drawer 必须 append-to-body,避免多页签与选项卡切换后遮罩错位 | ||
| 3 | +globs: antis-ncc-admin/**/*.vue | ||
| 4 | +alwaysApply: false | ||
| 5 | +--- | ||
| 6 | + | ||
| 7 | +# 弹窗 / 抽屉:必须挂到 body | ||
| 8 | + | ||
| 9 | +## 强制 | ||
| 10 | + | ||
| 11 | +1. 新增或修改 `el-dialog`、`el-drawer` 时,**必须**写 `append-to-body`(建议同时写 `modal-append-to-body`,除非嵌套全屏预览等场景需 `:modal-append-to-body="false"`)。 | ||
| 12 | +2. **禁止**省略 `append-to-body`,也禁止 `:append-to-body="false"`(除非有明确嵌套层理由并在注释中说明)。 | ||
| 13 | +3. 页内有多个 `el-tabs` 选项卡且挂弹窗时:切换选项卡应关闭未关弹窗,避免遮罩盖在另一张表上(参考 `wtSkzhb/index.vue`、`wtTcsz/index.vue`)。 | ||
| 14 | + | ||
| 15 | +## 原因 | ||
| 16 | + | ||
| 17 | +壳层(`modern-shell.scss` + `tagsViewPopupScope.js`)按 `body > .v-modal` / `body > .el-dialog__wrapper` 裁切遮罩并归属多页签。弹窗留在页内时,切换页签或选项卡后遮罩易错位、残留或盖错内容。 | ||
| 18 | + | ||
| 19 | +## 示例 | ||
| 20 | + | ||
| 21 | +```vue | ||
| 22 | +<el-dialog | ||
| 23 | + :visible.sync="visible" | ||
| 24 | + class="NCC-dialog NCC-dialog_center" | ||
| 25 | + lock-scroll | ||
| 26 | + append-to-body | ||
| 27 | + modal-append-to-body | ||
| 28 | + :close-on-click-modal="false" | ||
| 29 | + width="600px" | ||
| 30 | +> | ||
| 31 | +``` | ||
| 32 | + | ||
| 33 | +下拉被裁切时,`el-select` / `el-cascader` 等加 `popper-append-to-body`。 |
Antis.Erp.Plat/AGENTS.md
| @@ -63,6 +63,7 @@ | @@ -63,6 +63,7 @@ | ||
| 63 | - File names should be kebab-case for new Vue components. | 63 | - File names should be kebab-case for new Vue components. |
| 64 | - Empty values display as `无`; list/table cell content should not wrap unless existing page style requires it. | 64 | - Empty values display as `无`; list/table cell content should not wrap unless existing page style requires it. |
| 65 | - Use Node.js 16.20.2 for `antis-ncc-admin`; newer Node versions can fail on this project. | 65 | - Use Node.js 16.20.2 for `antis-ncc-admin`; newer Node versions can fail on this project. |
| 66 | +- **Dialog/drawer mask**: every `el-dialog` / `el-drawer` must use `append-to-body` (prefer `modal-append-to-body` too) so masks align with TagsView shell (`modern-shell.scss`, `tagsViewPopupScope.js`). On multi `el-tabs` pages, close open dialogs when switching tabs. Rule: `.cursor/rules/wt-dialog-append-to-body.mdc`. | ||
| 66 | 67 | ||
| 67 | ## POS And Douyin | 68 | ## POS And Douyin |
| 68 | 69 |
Antis.Erp.Plat/antis-ncc-admin/scripts/e2e-wtHy-dual-tab-mask.js
0 → 100644
| 1 | +/** | ||
| 2 | + * E2E:两个客户档案页签 + 新建弹窗遮罩 | ||
| 3 | + * 运行:node scripts/e2e-wtHy-dual-tab-mask.js | ||
| 4 | + */ | ||
| 5 | +const { chromium } = require('playwright') | ||
| 6 | +const { execFileSync } = require('child_process') | ||
| 7 | + | ||
| 8 | +const BASE = process.env.ADMIN_URL || 'http://127.0.0.1:3000' | ||
| 9 | +const API = process.env.API_URL || 'http://127.0.0.1:2011' | ||
| 10 | + | ||
| 11 | +function loginToken() { | ||
| 12 | + const out = execFileSync( | ||
| 13 | + 'curl', | ||
| 14 | + [ | ||
| 15 | + '-s', | ||
| 16 | + '-X', | ||
| 17 | + 'POST', | ||
| 18 | + `${API}/api/oauth/Login`, | ||
| 19 | + '-H', | ||
| 20 | + 'Content-Type: application/x-www-form-urlencoded', | ||
| 21 | + '-d', | ||
| 22 | + 'account=admin&password=e10adc3949ba59abbe56e057f20f883e' | ||
| 23 | + ], | ||
| 24 | + { encoding: 'utf8' } | ||
| 25 | + ) | ||
| 26 | + const json = JSON.parse(out) | ||
| 27 | + if (!json || !json.data || !json.data.token) throw new Error('login failed: ' + out.slice(0, 300)) | ||
| 28 | + return json.data.token | ||
| 29 | +} | ||
| 30 | + | ||
| 31 | +function visibleModal(page) { | ||
| 32 | + return page.evaluate(() => { | ||
| 33 | + const modals = Array.from(document.querySelectorAll('body > .v-modal')) | ||
| 34 | + return modals | ||
| 35 | + .filter(m => { | ||
| 36 | + const st = getComputedStyle(m) | ||
| 37 | + if (st.display === 'none' || st.visibility === 'hidden') return false | ||
| 38 | + if (parseFloat(st.opacity || '1') === 0) return false | ||
| 39 | + if (m.classList.contains('tags-view-popup-hidden')) return false | ||
| 40 | + return true | ||
| 41 | + }) | ||
| 42 | + .map(m => ({ | ||
| 43 | + path: m.getAttribute('data-tags-view-path'), | ||
| 44 | + z: m.style.zIndex, | ||
| 45 | + hiddenClass: m.classList.contains('tags-view-popup-hidden') | ||
| 46 | + })) | ||
| 47 | + }) | ||
| 48 | +} | ||
| 49 | + | ||
| 50 | +function visibleDialogs(page) { | ||
| 51 | + return page.evaluate(() => { | ||
| 52 | + return Array.from(document.querySelectorAll('body > .el-dialog__wrapper')) | ||
| 53 | + .filter(w => { | ||
| 54 | + if (w.style.display === 'none') return false | ||
| 55 | + if (w.classList.contains('tags-view-popup-hidden')) return false | ||
| 56 | + const st = getComputedStyle(w) | ||
| 57 | + return st.display !== 'none' && st.visibility !== 'hidden' | ||
| 58 | + }) | ||
| 59 | + .map(w => ({ | ||
| 60 | + path: w.getAttribute('data-tags-view-path'), | ||
| 61 | + title: (w.querySelector('.el-dialog__title') || {}).textContent || '' | ||
| 62 | + })) | ||
| 63 | + }) | ||
| 64 | +} | ||
| 65 | + | ||
| 66 | +async function openWtHyTab(page, inst) { | ||
| 67 | + await page.goto(`${BASE}/#/wtHy?_inst=${inst}`, { waitUntil: 'networkidle', timeout: 60000 }) | ||
| 68 | + await page.waitForTimeout(800) | ||
| 69 | +} | ||
| 70 | + | ||
| 71 | +async function clickAdd(page) { | ||
| 72 | + // 工具栏「新增」 | ||
| 73 | + const btn = page.locator('button:has-text("新增"), .el-button:has-text("新增")').first() | ||
| 74 | + await btn.click({ timeout: 15000 }) | ||
| 75 | + await page.waitForTimeout(600) | ||
| 76 | +} | ||
| 77 | + | ||
| 78 | +async function run() { | ||
| 79 | + const token = await loginToken() | ||
| 80 | + const browser = await chromium.launch({ headless: true }) | ||
| 81 | + const context = await browser.newContext() | ||
| 82 | + const page = await context.newPage() | ||
| 83 | + | ||
| 84 | + // 写入与项目一致的 token 存储格式 | ||
| 85 | + await page.goto(`${BASE}/#/login`, { waitUntil: 'domcontentloaded' }) | ||
| 86 | + await page.evaluate(t => { | ||
| 87 | + localStorage.setItem('ncc_token', `${t}|String`) | ||
| 88 | + }, token) | ||
| 89 | + await page.goto(`${BASE}/#/home`, { waitUntil: 'networkidle', timeout: 90000 }) | ||
| 90 | + await page.waitForTimeout(1500) | ||
| 91 | + | ||
| 92 | + const fails = [] | ||
| 93 | + const pathA = '/wtHy?_inst=e2e111' | ||
| 94 | + const pathB = '/wtHy?_inst=e2e222' | ||
| 95 | + | ||
| 96 | + // 打开 A | ||
| 97 | + await openWtHyTab(page, 'e2e111') | ||
| 98 | + await clickAdd(page) | ||
| 99 | + let dialogs = await visibleDialogs(page) | ||
| 100 | + let modals = await visibleModal(page) | ||
| 101 | + console.log('A open', { dialogs, modals, href: await page.evaluate(() => location.hash) }) | ||
| 102 | + if (!dialogs.length) fails.push('A: 打开新建后应有弹窗') | ||
| 103 | + if (!modals.length) fails.push('A: 打开新建后应有遮罩') | ||
| 104 | + | ||
| 105 | + // 打开 B(新页签实例) | ||
| 106 | + await openWtHyTab(page, 'e2e222') | ||
| 107 | + await page.waitForTimeout(500) | ||
| 108 | + dialogs = await visibleDialogs(page) | ||
| 109 | + modals = await visibleModal(page) | ||
| 110 | + console.log('switch B', { dialogs, modals }) | ||
| 111 | + // A 的弹窗应被隐藏;B 尚未打开新建 | ||
| 112 | + if (dialogs.some(d => (d.title || '').includes('新建'))) { | ||
| 113 | + fails.push('B: 不应看到 A 的新建弹窗') | ||
| 114 | + } | ||
| 115 | + if (modals.length) fails.push('B: 无新建时不应有可见遮罩') | ||
| 116 | + | ||
| 117 | + // 切回 A | ||
| 118 | + await page.goto(`${BASE}/#${pathA}`, { waitUntil: 'networkidle', timeout: 60000 }) | ||
| 119 | + await page.waitForTimeout(800) | ||
| 120 | + dialogs = await visibleDialogs(page) | ||
| 121 | + modals = await visibleModal(page) | ||
| 122 | + console.log('back A', { dialogs, modals }) | ||
| 123 | + if (!dialogs.some(d => (d.title || '').includes('新建') || (d.title || '').includes('客户'))) { | ||
| 124 | + fails.push('回 A: 应恢复新建弹窗') | ||
| 125 | + } | ||
| 126 | + if (!modals.length) fails.push('回 A: 应同时有遮罩') | ||
| 127 | + | ||
| 128 | + // B 再打开新建,两边互不串 | ||
| 129 | + await page.goto(`${BASE}/#${pathB}`, { waitUntil: 'networkidle', timeout: 60000 }) | ||
| 130 | + await page.waitForTimeout(500) | ||
| 131 | + await clickAdd(page) | ||
| 132 | + dialogs = await visibleDialogs(page) | ||
| 133 | + modals = await visibleModal(page) | ||
| 134 | + console.log('B open', { dialogs, modals }) | ||
| 135 | + if (!dialogs.length) fails.push('B 打开新建:应有弹窗') | ||
| 136 | + if (!modals.length) fails.push('B 打开新建:应有遮罩') | ||
| 137 | + | ||
| 138 | + await page.goto(`${BASE}/#${pathA}`, { waitUntil: 'networkidle', timeout: 60000 }) | ||
| 139 | + await page.waitForTimeout(800) | ||
| 140 | + dialogs = await visibleDialogs(page) | ||
| 141 | + modals = await visibleModal(page) | ||
| 142 | + console.log('A again', { dialogs, modals }) | ||
| 143 | + if (!modals.length) fails.push('最终回 A:应有遮罩') | ||
| 144 | + if (!dialogs.length) fails.push('最终回 A:应有弹窗') | ||
| 145 | + | ||
| 146 | + await browser.close() | ||
| 147 | + | ||
| 148 | + if (fails.length) { | ||
| 149 | + console.error('E2E FAIL') | ||
| 150 | + fails.forEach(f => console.error(' -', f)) | ||
| 151 | + process.exit(1) | ||
| 152 | + } | ||
| 153 | + console.log('E2E PASS: dual wtHy tabs dialog+mask sync') | ||
| 154 | + process.exit(0) | ||
| 155 | +} | ||
| 156 | + | ||
| 157 | +run().catch(err => { | ||
| 158 | + console.error(err) | ||
| 159 | + process.exit(1) | ||
| 160 | +}) |
Antis.Erp.Plat/antis-ncc-admin/scripts/test-tags-view-popup-scope.js
0 → 100644
| 1 | +/** | ||
| 2 | + * 双页签遮罩测试(含 Element 共用单遮罩场景) | ||
| 3 | + * 运行:node scripts/test-tags-view-popup-scope.js | ||
| 4 | + */ | ||
| 5 | +const { JSDOM } = require('jsdom') | ||
| 6 | +const path = require('path') | ||
| 7 | +const fs = require('fs') | ||
| 8 | +const vm = require('vm') | ||
| 9 | + | ||
| 10 | +const dom = new JSDOM('<!DOCTYPE html><html><body><div id="app"></div></body></html>', { | ||
| 11 | + url: 'http://localhost:3000/', | ||
| 12 | + pretendToBeVisual: true | ||
| 13 | +}) | ||
| 14 | +const { window } = dom | ||
| 15 | +const { document } = window | ||
| 16 | + | ||
| 17 | +Object.defineProperty(window.HTMLElement.prototype, 'offsetWidth', { | ||
| 18 | + configurable: true, | ||
| 19 | + get() { | ||
| 20 | + if (this.style.display === 'none') return 0 | ||
| 21 | + if (this.classList.contains('tags-view-popup-hidden')) return 0 | ||
| 22 | + let p = this.parentElement | ||
| 23 | + while (p) { | ||
| 24 | + if (p.style && p.style.display === 'none') return 0 | ||
| 25 | + p = p.parentElement | ||
| 26 | + } | ||
| 27 | + return this.classList.contains('el-dialog__wrapper') || this.classList.contains('v-modal') ? 100 : 10 | ||
| 28 | + } | ||
| 29 | +}) | ||
| 30 | +Object.defineProperty(window.HTMLElement.prototype, 'offsetHeight', { | ||
| 31 | + configurable: true, | ||
| 32 | + get() { | ||
| 33 | + return this.offsetWidth ? 80 : 0 | ||
| 34 | + } | ||
| 35 | +}) | ||
| 36 | + | ||
| 37 | +const scopePath = path.resolve(__dirname, '../src/utils/tagsViewPopupScope.js') | ||
| 38 | +let src = fs.readFileSync(scopePath, 'utf8') | ||
| 39 | +src = src | ||
| 40 | + .replace(/export const (\w+)\s*=/g, 'const $1 =') | ||
| 41 | + .replace(/export function (\w+)/g, 'function $1') | ||
| 42 | + | ||
| 43 | +src += ` | ||
| 44 | +;module.exports = { | ||
| 45 | + PATH_ATTR, | ||
| 46 | + Z_ATTR, | ||
| 47 | + HIDDEN_CLASS, | ||
| 48 | + initTagsViewPopupScope, | ||
| 49 | + __tagsViewPopupScopeTestHooks | ||
| 50 | +}; | ||
| 51 | +` | ||
| 52 | + | ||
| 53 | +const mod = { exports: {} } | ||
| 54 | +const context = { | ||
| 55 | + module: mod, | ||
| 56 | + exports: mod.exports, | ||
| 57 | + require, | ||
| 58 | + console, | ||
| 59 | + document, | ||
| 60 | + window, | ||
| 61 | + HTMLElement: window.HTMLElement, | ||
| 62 | + MutationObserver: window.MutationObserver, | ||
| 63 | + requestAnimationFrame: cb => setTimeout(cb, 0), | ||
| 64 | + setTimeout, | ||
| 65 | + clearTimeout, | ||
| 66 | + parseInt, | ||
| 67 | + Number, | ||
| 68 | + Array, | ||
| 69 | + String, | ||
| 70 | + Object, | ||
| 71 | + Math | ||
| 72 | +} | ||
| 73 | +context.global = context | ||
| 74 | +vm.createContext(context) | ||
| 75 | +vm.runInContext(src, context) | ||
| 76 | +const api = mod.exports | ||
| 77 | +const HIDDEN = api.HIDDEN_CLASS | ||
| 78 | +const PATH_ATTR = api.PATH_ATTR | ||
| 79 | +const hooks = api.__tagsViewPopupScopeTestHooks() | ||
| 80 | + | ||
| 81 | +function flush() { | ||
| 82 | + return new Promise(resolve => { | ||
| 83 | + hooks.applyVisibility() | ||
| 84 | + setTimeout(() => { | ||
| 85 | + hooks.applyVisibility() | ||
| 86 | + resolve() | ||
| 87 | + }, 20) | ||
| 88 | + }) | ||
| 89 | +} | ||
| 90 | + | ||
| 91 | +function isHidden(el) { | ||
| 92 | + return el.classList.contains(HIDDEN) | ||
| 93 | +} | ||
| 94 | + | ||
| 95 | +function createBodyDialog(fullPath, zDialog) { | ||
| 96 | + const wrap = document.createElement('div') | ||
| 97 | + wrap.className = 'el-dialog__wrapper' | ||
| 98 | + wrap.style.zIndex = String(zDialog) | ||
| 99 | + wrap.style.display = '' | ||
| 100 | + wrap.setAttribute(PATH_ATTR, fullPath) | ||
| 101 | + wrap.setAttribute('data-tags-view-z', String(zDialog)) | ||
| 102 | + document.body.appendChild(wrap) | ||
| 103 | + return wrap | ||
| 104 | +} | ||
| 105 | + | ||
| 106 | +function createSharedModal(zModal) { | ||
| 107 | + const modal = document.createElement('div') | ||
| 108 | + modal.className = 'v-modal' | ||
| 109 | + modal.style.zIndex = String(zModal) | ||
| 110 | + document.body.appendChild(modal) | ||
| 111 | + return modal | ||
| 112 | +} | ||
| 113 | + | ||
| 114 | +async function run() { | ||
| 115 | + const pathA = '/wtHy?_inst=111' | ||
| 116 | + const pathB = '/wtHy?_inst=222' | ||
| 117 | + const fails = [] | ||
| 118 | + | ||
| 119 | + // —— 核心:Element 共用一块遮罩,A/B 各开弹窗,反复切换两边都要有遮罩 —— | ||
| 120 | + hooks.onRouteChange({ fullPath: pathA }) | ||
| 121 | + const dlgA = createBodyDialog(pathA, 2001) | ||
| 122 | + const sharedModal = createSharedModal(2000) | ||
| 123 | + await flush() | ||
| 124 | + if (isHidden(dlgA) || isHidden(sharedModal)) fails.push('S0: A 打开时应有弹窗+遮罩') | ||
| 125 | + | ||
| 126 | + hooks.onRouteChange({ fullPath: pathB }) | ||
| 127 | + await flush() | ||
| 128 | + if (!isHidden(dlgA)) fails.push('S0: 切 B 后 A 弹窗应隐藏') | ||
| 129 | + if (!isHidden(sharedModal)) fails.push('S0: B 无弹窗时共用遮罩应隐藏') | ||
| 130 | + | ||
| 131 | + // B 也打开新建(仍是同一块遮罩,z-index 抬高模拟 Element) | ||
| 132 | + const dlgB = createBodyDialog(pathB, 2003) | ||
| 133 | + sharedModal.style.zIndex = '2002' | ||
| 134 | + sharedModal.setAttribute('data-tags-view-z', '2002') | ||
| 135 | + await flush() | ||
| 136 | + if (isHidden(dlgB) || isHidden(sharedModal)) fails.push('S1: B 打开新建应有弹窗+遮罩') | ||
| 137 | + if (!isHidden(dlgA)) fails.push('S1: B 页时 A 弹窗应隐藏') | ||
| 138 | + | ||
| 139 | + // 反复切换 | ||
| 140 | + for (let i = 0; i < 5; i++) { | ||
| 141 | + hooks.onRouteChange({ fullPath: pathA }) | ||
| 142 | + await flush() | ||
| 143 | + if (isHidden(dlgA)) fails.push(`S2.${i}A: 弹窗应显示`) | ||
| 144 | + if (isHidden(sharedModal)) fails.push(`S2.${i}A: 遮罩应显示`) | ||
| 145 | + if (!isHidden(dlgB)) fails.push(`S2.${i}A: B 弹窗应隐藏`) | ||
| 146 | + | ||
| 147 | + hooks.onRouteChange({ fullPath: pathB }) | ||
| 148 | + await flush() | ||
| 149 | + if (isHidden(dlgB)) fails.push(`S2.${i}B: 弹窗应显示`) | ||
| 150 | + if (isHidden(sharedModal)) fails.push(`S2.${i}B: 遮罩应显示`) | ||
| 151 | + if (!isHidden(dlgA)) fails.push(`S2.${i}B: A 弹窗应隐藏`) | ||
| 152 | + } | ||
| 153 | + | ||
| 154 | + // 切到无弹窗的库存查询 | ||
| 155 | + hooks.onRouteChange({ fullPath: '/wtStockSummary' }) | ||
| 156 | + await flush() | ||
| 157 | + if (!isHidden(dlgA) || !isHidden(dlgB)) fails.push('S3: 无弹窗页签时两边弹窗都应隐藏') | ||
| 158 | + if (!isHidden(sharedModal)) fails.push('S3: 无弹窗页签时遮罩应隐藏') | ||
| 159 | + | ||
| 160 | + // 回 A 仍应恢复 | ||
| 161 | + hooks.onRouteChange({ fullPath: pathA }) | ||
| 162 | + await flush() | ||
| 163 | + if (isHidden(dlgA) || isHidden(sharedModal)) fails.push('S4: 回 A 应恢复弹窗+遮罩') | ||
| 164 | + | ||
| 165 | + // A 弹窗应在遮罩之上 | ||
| 166 | + const zDlg = parseInt(dlgA.style.zIndex, 10) | ||
| 167 | + const zModal = parseInt(sharedModal.style.zIndex, 10) | ||
| 168 | + if (!(zDlg > zModal)) fails.push(`S5: 当前页弹窗 z(${zDlg}) 应高于遮罩 z(${zModal})`) | ||
| 169 | + | ||
| 170 | + // S6: 关闭弹窗后不应再显示(模拟 Element 写 display:none) | ||
| 171 | + dlgA.style.display = 'none' | ||
| 172 | + await flush() | ||
| 173 | + if (!isHidden(dlgA)) fails.push('S6: Element 关闭后弹窗应隐藏') | ||
| 174 | + if (!isHidden(sharedModal)) fails.push('S6: 关闭后遮罩应隐藏') | ||
| 175 | + | ||
| 176 | + if (fails.length) { | ||
| 177 | + console.error('FAIL') | ||
| 178 | + fails.forEach(f => console.error(' -', f)) | ||
| 179 | + process.exit(1) | ||
| 180 | + } | ||
| 181 | + console.log('PASS shared-modal dual wtHy tabs (repeated switch + close)') | ||
| 182 | + process.exit(0) | ||
| 183 | +} | ||
| 184 | + | ||
| 185 | +run().catch(err => { | ||
| 186 | + console.error(err) | ||
| 187 | + process.exit(1) | ||
| 188 | +}) |
Antis.Erp.Plat/antis-ncc-admin/src/api/user.js
| @@ -12,7 +12,6 @@ export function login(data) { | @@ -12,7 +12,6 @@ export function login(data) { | ||
| 12 | }) | 12 | }) |
| 13 | } | 13 | } |
| 14 | export function Pislogin(data) { | 14 | export function Pislogin(data) { |
| 15 | - console.log("开始验证我的登录"); | ||
| 16 | return request({ | 15 | return request({ |
| 17 | url: '/api/oauth/PisLogin', | 16 | url: '/api/oauth/PisLogin', |
| 18 | method: 'post', | 17 | method: 'post', |
Antis.Erp.Plat/antis-ncc-admin/src/components/Generator/index/RightComponents/Cascader/TreeNodeDialog.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div> | 2 | <div> |
| 3 | <el-dialog v-bind="$attrs" :close-on-click-modal="false" :modal-append-to-body="false" | 3 | <el-dialog v-bind="$attrs" :close-on-click-modal="false" :modal-append-to-body="false" |
| 4 | v-on="$listeners" @open="onOpen" @close="onClose" width="600px" | 4 | v-on="$listeners" @open="onOpen" @close="onClose" width="600px" |
| 5 | - class="NCC-dialog NCC-dialog_center"> | 5 | + class="NCC-dialog NCC-dialog_center" append-to-body> |
| 6 | <el-row :gutter="0"> | 6 | <el-row :gutter="0"> |
| 7 | <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px"> | 7 | <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px"> |
| 8 | <el-col :span="24"> | 8 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/components/Generator/index/RightComponents/TreeSelect/TreeNodeDialog.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div> | 2 | <div> |
| 3 | <el-dialog v-bind="$attrs" :close-on-click-modal="false" :modal-append-to-body="false" | 3 | <el-dialog v-bind="$attrs" :close-on-click-modal="false" :modal-append-to-body="false" |
| 4 | v-on="$listeners" @open="onOpen" @close="onClose" width="600px" | 4 | v-on="$listeners" @open="onOpen" @close="onClose" width="600px" |
| 5 | - class="NCC-dialog NCC-dialog_center"> | 5 | + class="NCC-dialog NCC-dialog_center" append-to-body> |
| 6 | <el-row :gutter="0"> | 6 | <el-row :gutter="0"> |
| 7 | <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px"> | 7 | <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px"> |
| 8 | <el-col :span="24"> | 8 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/components/WtDjztTag/index.vue
| @@ -18,6 +18,10 @@ import { | @@ -18,6 +18,10 @@ import { | ||
| 18 | isWtDjztRejected, | 18 | isWtDjztRejected, |
| 19 | resolveWtBillAuditRow | 19 | resolveWtBillAuditRow |
| 20 | } from '@/utils/wtDjztDisplay' | 20 | } from '@/utils/wtDjztDisplay' |
| 21 | +import { | ||
| 22 | + getWtFpsqDjztDisplayLabel, | ||
| 23 | + getWtFpsqDjztTagType | ||
| 24 | +} from '@/utils/wtFpsqDjztDisplay' | ||
| 21 | 25 | ||
| 22 | export default { | 26 | export default { |
| 23 | name: 'WtDjztTag', | 27 | name: 'WtDjztTag', |
| @@ -26,6 +30,8 @@ export default { | @@ -26,6 +30,8 @@ export default { | ||
| 26 | // 默认 null:未传时不得用空串覆盖 row.djzt(否则会全显示成「待审核」) | 30 | // 默认 null:未传时不得用空串覆盖 row.djzt(否则会全显示成「待审核」) |
| 27 | djzt: { type: [String, Number], default: null }, | 31 | djzt: { type: [String, Number], default: null }, |
| 28 | spbz: { type: String, default: null }, | 32 | spbz: { type: String, default: null }, |
| 33 | + /** 发票申请等新流程状态展示 */ | ||
| 34 | + variant: { type: String, default: '' }, | ||
| 29 | size: { type: String, default: 'mini' }, | 35 | size: { type: String, default: 'mini' }, |
| 30 | effect: { type: String, default: 'light' } | 36 | effect: { type: String, default: 'light' } |
| 31 | }, | 37 | }, |
| @@ -34,13 +40,23 @@ export default { | @@ -34,13 +40,23 @@ export default { | ||
| 34 | if (this.row) return resolveWtBillAuditRow(this.row, this.djzt) | 40 | if (this.row) return resolveWtBillAuditRow(this.row, this.djzt) |
| 35 | return resolveWtBillAuditRow(this.djzt, this.spbz) | 41 | return resolveWtBillAuditRow(this.djzt, this.spbz) |
| 36 | }, | 42 | }, |
| 43 | + isFpsqVariant() { | ||
| 44 | + return this.variant === 'fpsq' | ||
| 45 | + }, | ||
| 37 | label() { | 46 | label() { |
| 47 | + if (this.isFpsqVariant) { | ||
| 48 | + return getWtFpsqDjztDisplayLabel(this.auditCtx.djzt, this.auditCtx.spbz) | ||
| 49 | + } | ||
| 38 | return getWtDjztDisplayLabel(this.auditCtx.djzt, this.auditCtx.spbz) | 50 | return getWtDjztDisplayLabel(this.auditCtx.djzt, this.auditCtx.spbz) |
| 39 | }, | 51 | }, |
| 40 | tagType() { | 52 | tagType() { |
| 53 | + if (this.isFpsqVariant) { | ||
| 54 | + return getWtFpsqDjztTagType(this.auditCtx.djzt, this.auditCtx.spbz) | ||
| 55 | + } | ||
| 41 | return getWtDjztTagType(this.auditCtx.djzt, this.auditCtx.spbz) | 56 | return getWtDjztTagType(this.auditCtx.djzt, this.auditCtx.spbz) |
| 42 | }, | 57 | }, |
| 43 | rejected() { | 58 | rejected() { |
| 59 | + if (this.isFpsqVariant) return false | ||
| 44 | return isWtDjztRejected(this.auditCtx.djzt, this.auditCtx.spbz) | 60 | return isWtDjztRejected(this.auditCtx.djzt, this.auditCtx.spbz) |
| 45 | } | 61 | } |
| 46 | } | 62 | } |
Antis.Erp.Plat/antis-ncc-admin/src/components/WtXsckdListTotalsBar/index.vue
| @@ -14,6 +14,8 @@ | @@ -14,6 +14,8 @@ | ||
| 14 | <span class="wt-xsckd-list-totals-bar__sep">|</span> | 14 | <span class="wt-xsckd-list-totals-bar__sep">|</span> |
| 15 | <span>收款金额 {{ skjeText }}</span> | 15 | <span>收款金额 {{ skjeText }}</span> |
| 16 | <span class="wt-xsckd-list-totals-bar__sep">|</span> | 16 | <span class="wt-xsckd-list-totals-bar__sep">|</span> |
| 17 | + <span>押金金额 {{ yjjeText }}</span> | ||
| 18 | + <span class="wt-xsckd-list-totals-bar__sep">|</span> | ||
| 17 | <span>已退款 {{ refundedText }}</span> | 19 | <span>已退款 {{ refundedText }}</span> |
| 18 | <span class="wt-xsckd-list-totals-bar__sep">|</span> | 20 | <span class="wt-xsckd-list-totals-bar__sep">|</span> |
| 19 | <span class="wt-xsckd-list-totals-bar__highlight">实际收款 {{ actualSkjeText }}</span> | 21 | <span class="wt-xsckd-list-totals-bar__highlight">实际收款 {{ actualSkjeText }}</span> |
| @@ -21,6 +23,8 @@ | @@ -21,6 +23,8 @@ | ||
| 21 | <template v-else> | 23 | <template v-else> |
| 22 | <span class="wt-xsckd-list-totals-bar__sep">|</span> | 24 | <span class="wt-xsckd-list-totals-bar__sep">|</span> |
| 23 | <span>退款 {{ skjeText }}</span> | 25 | <span>退款 {{ skjeText }}</span> |
| 26 | + <span class="wt-xsckd-list-totals-bar__sep">|</span> | ||
| 27 | + <span>押金金额 {{ yjjeText }}</span> | ||
| 24 | </template> | 28 | </template> |
| 25 | </div> | 29 | </div> |
| 26 | </template> | 30 | </template> |
| @@ -66,6 +70,9 @@ export default { | @@ -66,6 +70,9 @@ export default { | ||
| 66 | skjeText() { | 70 | skjeText() { |
| 67 | return this.formatMoney(this.totals && this.totals.totalSkje) | 71 | return this.formatMoney(this.totals && this.totals.totalSkje) |
| 68 | }, | 72 | }, |
| 73 | + yjjeText() { | ||
| 74 | + return this.formatMoney(this.totals && this.totals.totalYjje) | ||
| 75 | + }, | ||
| 69 | refundedText() { | 76 | refundedText() { |
| 70 | return this.formatMoney(this.totals && this.totals.totalRefunded) | 77 | return this.formatMoney(this.totals && this.totals.totalRefunded) |
| 71 | }, | 78 | }, |
Antis.Erp.Plat/antis-ncc-admin/src/lang/en.js
| @@ -145,6 +145,10 @@ export default { | @@ -145,6 +145,10 @@ export default { | ||
| 145 | scanTip: 'APP Scan code login', | 145 | scanTip: 'APP Scan code login', |
| 146 | accountTip: 'Please enter the account number', | 146 | accountTip: 'Please enter the account number', |
| 147 | passwordTip: 'Please enter your password', | 147 | passwordTip: 'Please enter your password', |
| 148 | + rememberAccount: 'Remember account', | ||
| 149 | + showPassword: 'Show password', | ||
| 150 | + hidePassword: 'Hide password', | ||
| 151 | + loginErrorFallback: 'Login failed. Please check your account or password.', | ||
| 148 | mobile: 'Please enter mobile number', | 152 | mobile: 'Please enter mobile number', |
| 149 | rightMobile: 'Please enter the correct mobile number', | 153 | rightMobile: 'Please enter the correct mobile number', |
| 150 | smsCode: 'Please enter the verification code', | 154 | smsCode: 'Please enter the verification code', |
Antis.Erp.Plat/antis-ncc-admin/src/lang/zh.js
| @@ -145,6 +145,10 @@ export default { | @@ -145,6 +145,10 @@ export default { | ||
| 145 | scanTip: 'APP扫码登录', | 145 | scanTip: 'APP扫码登录', |
| 146 | accountTip: '请输入账号', | 146 | accountTip: '请输入账号', |
| 147 | passwordTip: '请输入密码', | 147 | passwordTip: '请输入密码', |
| 148 | + rememberAccount: '记住账号', | ||
| 149 | + showPassword: '显示密码', | ||
| 150 | + hidePassword: '隐藏密码', | ||
| 151 | + loginErrorFallback: '登录失败,请检查账号或密码', | ||
| 148 | mobile: '请输入手机号', | 152 | mobile: '请输入手机号', |
| 149 | rightMobile: '请输入正确的手机号', | 153 | rightMobile: '请输入正确的手机号', |
| 150 | smsCode: '请输入验证码', | 154 | smsCode: '请输入验证码', |
Antis.Erp.Plat/antis-ncc-admin/src/main.js
| @@ -21,6 +21,7 @@ import './permission' // permission control | @@ -21,6 +21,7 @@ import './permission' // permission control | ||
| 21 | import './utils/error-log' // error log | 21 | import './utils/error-log' // error log |
| 22 | import { message } from './utils/message'; | 22 | import { message } from './utils/message'; |
| 23 | import { bindMessageBoxStackGuard } from '@/utils/stackedDialogZIndex' | 23 | import { bindMessageBoxStackGuard } from '@/utils/stackedDialogZIndex' |
| 24 | +import { initTagsViewPopupScope } from '@/utils/tagsViewPopupScope' | ||
| 24 | 25 | ||
| 25 | import * as filters from './filters' // global filters | 26 | import * as filters from './filters' // global filters |
| 26 | import { openBizPage, buildNewTabRoute } from '@/utils/open-biz-page' | 27 | import { openBizPage, buildNewTabRoute } from '@/utils/open-biz-page' |
| @@ -36,6 +37,7 @@ Vue.use(Element, { | @@ -36,6 +37,7 @@ Vue.use(Element, { | ||
| 36 | i18n: (key, value) => i18n.t(key, value) | 37 | i18n: (key, value) => i18n.t(key, value) |
| 37 | }) | 38 | }) |
| 38 | bindMessageBoxStackGuard(Vue) | 39 | bindMessageBoxStackGuard(Vue) |
| 40 | +initTagsViewPopupScope(router) | ||
| 39 | // 批量引入组件 | 41 | // 批量引入组件 |
| 40 | import components from './components' | 42 | import components from './components' |
| 41 | Vue.use(components) | 43 | Vue.use(components) |
Antis.Erp.Plat/antis-ncc-admin/src/mixins/wtXsckdListTotalsMixin.js
| @@ -7,6 +7,7 @@ const EMPTY_TOTALS = { | @@ -7,6 +7,7 @@ const EMPTY_TOTALS = { | ||
| 7 | totalYdje: null, | 7 | totalYdje: null, |
| 8 | totalYsje: null, | 8 | totalYsje: null, |
| 9 | totalSkje: null, | 9 | totalSkje: null, |
| 10 | + totalYjje: null, | ||
| 10 | totalRefunded: null, | 11 | totalRefunded: null, |
| 11 | totalActualSkje: null | 12 | totalActualSkje: null |
| 12 | } | 13 | } |
| @@ -70,6 +71,7 @@ export default { | @@ -70,6 +71,7 @@ export default { | ||
| 70 | totalYdje: d.totalYdje != null ? d.totalYdje : d.TotalYdje, | 71 | totalYdje: d.totalYdje != null ? d.totalYdje : d.TotalYdje, |
| 71 | totalYsje: d.totalYsje != null ? d.totalYsje : d.TotalYsje, | 72 | totalYsje: d.totalYsje != null ? d.totalYsje : d.TotalYsje, |
| 72 | totalSkje: d.totalSkje != null ? d.totalSkje : d.TotalSkje, | 73 | totalSkje: d.totalSkje != null ? d.totalSkje : d.TotalSkje, |
| 74 | + totalYjje: d.totalYjje != null ? d.totalYjje : d.TotalYjje, | ||
| 73 | totalRefunded: d.totalRefunded != null ? d.totalRefunded : d.TotalRefunded, | 75 | totalRefunded: d.totalRefunded != null ? d.totalRefunded : d.TotalRefunded, |
| 74 | totalActualSkje: d.totalActualSkje != null ? d.totalActualSkje : d.TotalActualSkje | 76 | totalActualSkje: d.totalActualSkje != null ? d.totalActualSkje : d.TotalActualSkje |
| 75 | } | 77 | } |
Antis.Erp.Plat/antis-ncc-admin/src/router/index.js
| @@ -169,7 +169,31 @@ export const constantRoutes = [{ | @@ -169,7 +169,31 @@ export const constantRoutes = [{ | ||
| 169 | component: Layout, | 169 | component: Layout, |
| 170 | hidden: true, | 170 | hidden: true, |
| 171 | children: [ | 171 | children: [ |
| 172 | - { path: 'index', name: 'WtCwReportIndex', component: () => import('@/views/wtCwReport/index'), meta: { title: '财务报表', noCache: true } } | 172 | + { path: 'index', name: 'WtCwReportIndex', component: () => import('@/views/wtCwReport/index'), meta: { title: '损益表', noCache: true } } |
| 173 | + ] | ||
| 174 | + }, | ||
| 175 | + { | ||
| 176 | + path: '/extend-cw-balance-sheet', | ||
| 177 | + component: Layout, | ||
| 178 | + hidden: true, | ||
| 179 | + children: [ | ||
| 180 | + { path: 'index', name: 'WtCwBalanceSheetIndex', component: () => import('@/views/wtCwBalanceSheet/index'), meta: { title: '资产负债表', noCache: true } } | ||
| 181 | + ] | ||
| 182 | + }, | ||
| 183 | + { | ||
| 184 | + path: '/wtWtdxkhcx', | ||
| 185 | + component: Layout, | ||
| 186 | + hidden: true, | ||
| 187 | + children: [ | ||
| 188 | + { path: 'index', name: 'WtWtdxkhcxIndex', component: () => import('@/views/wtWtdxkhcx/index'), meta: { title: '委托客户查询', noCache: true } } | ||
| 189 | + ] | ||
| 190 | + }, | ||
| 191 | + { | ||
| 192 | + path: '/wtWtdxkccx', | ||
| 193 | + component: Layout, | ||
| 194 | + hidden: true, | ||
| 195 | + children: [ | ||
| 196 | + { path: 'index', name: 'WtWtdxkccxIndex', component: () => import('@/views/wtWtdxkccx/index'), meta: { title: '委托库存查询', noCache: true } } | ||
| 173 | ] | 197 | ] |
| 174 | }, | 198 | }, |
| 175 | // 欢迎首页常驻静态路由,避免动态路由尚未注册时被 * 重定向到 404 | 199 | // 欢迎首页常驻静态路由,避免动态路由尚未注册时被 * 重定向到 404 |
Antis.Erp.Plat/antis-ncc-admin/src/store/modules/user.js
| @@ -100,9 +100,7 @@ const actions = { | @@ -100,9 +100,7 @@ const actions = { | ||
| 100 | }, | 100 | }, |
| 101 | pislogin({ commit }, userInfo) { | 101 | pislogin({ commit }, userInfo) { |
| 102 | const { account, password,hospitalname } = userInfo | 102 | const { account, password,hospitalname } = userInfo |
| 103 | - console.log("userInfo:"+userInfo.hospitalname); | ||
| 104 | return new Promise((resolve, reject) => { | 103 | return new Promise((resolve, reject) => { |
| 105 | - console.log("调用pislogin"); | ||
| 106 | Pislogin(qs.stringify({ | 104 | Pislogin(qs.stringify({ |
| 107 | account: account.trim(), | 105 | account: account.trim(), |
| 108 | password: md5(password), | 106 | password: md5(password), |
| @@ -120,7 +118,6 @@ const actions = { | @@ -120,7 +118,6 @@ const actions = { | ||
| 120 | setToken(data.token) | 118 | setToken(data.token) |
| 121 | resolve() | 119 | resolve() |
| 122 | }).catch(error => { | 120 | }).catch(error => { |
| 123 | - console.log("catch:"+error); | ||
| 124 | reject(error) | 121 | reject(error) |
| 125 | }) | 122 | }) |
| 126 | }) | 123 | }) |
Antis.Erp.Plat/antis-ncc-admin/src/styles/element-ui.scss
| @@ -83,6 +83,37 @@ | @@ -83,6 +83,37 @@ | ||
| 83 | box-sizing: content-box; | 83 | box-sizing: content-box; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | +// 日期/日期范围面板:年(<< >>) 与 月(< >) 切换按钮拉开间距,降低误触 | ||
| 87 | +.el-picker-panel, | ||
| 88 | +.el-date-range-picker, | ||
| 89 | +.el-date-picker { | ||
| 90 | + .el-picker-panel__icon-btn { | ||
| 91 | + min-width: 28px; | ||
| 92 | + min-height: 28px; | ||
| 93 | + line-height: 28px; | ||
| 94 | + padding: 0 6px; | ||
| 95 | + box-sizing: border-box; | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + // 左侧:上一年 与 上一月 | ||
| 99 | + .el-picker-panel__icon-btn.el-icon-d-arrow-left { | ||
| 100 | + margin-right: 12px; | ||
| 101 | + } | ||
| 102 | + | ||
| 103 | + .el-picker-panel__icon-btn.el-icon-arrow-left { | ||
| 104 | + margin-left: 4px; | ||
| 105 | + } | ||
| 106 | + | ||
| 107 | + // 右侧:下一月 与 下一年 | ||
| 108 | + .el-picker-panel__icon-btn.el-icon-arrow-right { | ||
| 109 | + margin-right: 4px; | ||
| 110 | + } | ||
| 111 | + | ||
| 112 | + .el-picker-panel__icon-btn.el-icon-d-arrow-right { | ||
| 113 | + margin-left: 12px; | ||
| 114 | + } | ||
| 115 | +} | ||
| 116 | + | ||
| 86 | // tabs组件出现蓝色边框问题 | 117 | // tabs组件出现蓝色边框问题 |
| 87 | .el-tabs__item:focus.is-active.is-focus:not(:active) { | 118 | .el-tabs__item:focus.is-active.is-focus:not(:active) { |
| 88 | -webkit-box-shadow: none; | 119 | -webkit-box-shadow: none; |
Antis.Erp.Plat/antis-ncc-admin/src/styles/modern-shell.scss
| 1 | @import './variables.scss'; | 1 | @import './variables.scss'; |
| 2 | 2 | ||
| 3 | +// 顶栏 + 多页签区域高度、侧栏宽度(供弹窗遮罩裁切到「内容区」) | ||
| 4 | +// 默认按「有 TagsView / 侧栏展开」计算:避免 :has 不生效时遮罩裁切不准 | ||
| 5 | +html { | ||
| 6 | + --layout-shell-header-height: #{$layoutHeaderWithTagsHeight}; | ||
| 7 | + --layout-shell-sidebar-width: #{$sideBarWidth}; | ||
| 8 | +} | ||
| 9 | + | ||
| 10 | +html:not(:has(#tags-view-container)) { | ||
| 11 | + --layout-shell-header-height: #{$layoutNavbarHeight}; | ||
| 12 | +} | ||
| 13 | + | ||
| 14 | +html:has(#app .hideSidebar) { | ||
| 15 | + --layout-shell-sidebar-width: #{$sideBarCollapseWidth}; | ||
| 16 | +} | ||
| 17 | + | ||
| 18 | +html:has(#app .openSidebar) { | ||
| 19 | + --layout-shell-sidebar-width: #{$sideBarWidth}; | ||
| 20 | +} | ||
| 21 | + | ||
| 3 | // Vben5 风格设计令牌(全局壳层) | 22 | // Vben5 风格设计令牌(全局壳层) |
| 4 | #app { | 23 | #app { |
| 5 | --shell-bg: #f4f7fb; | 24 | --shell-bg: #f4f7fb; |
| @@ -250,3 +269,100 @@ | @@ -250,3 +269,100 @@ | ||
| 250 | 269 | ||
| 251 | // 侧栏菜单 Vben5 规范:置于 theme 之后再次引入,确保覆盖主题色对菜单的干扰 | 270 | // 侧栏菜单 Vben5 规范:置于 theme 之后再次引入,确保覆盖主题色对菜单的干扰 |
| 252 | @import './sidebar.scss'; | 271 | @import './sidebar.scss'; |
| 272 | + | ||
| 273 | +// ========== 弹窗/抽屉打开时保持侧栏、顶栏与多页签可切换 ========== | ||
| 274 | +// 根因:Element UI .v-modal / .el-dialog__wrapper 默认 z-index≈2000 且全屏, | ||
| 275 | +// 而 layout .fixed-header 仅 z-index:9、侧栏仅 1001,遮罩会罩住并压暗导航。 | ||
| 276 | + | ||
| 277 | +// 顶栏(Navbar + TagsView)抬到常规弹窗遮罩之上,页签不再被遮罩盖住变灰 | ||
| 278 | +#app .fixed-header { | ||
| 279 | + z-index: 4000 !important; | ||
| 280 | + background-color: #fff; | ||
| 281 | +} | ||
| 282 | + | ||
| 283 | +// 左侧菜单抬到遮罩之上,保证可点击切换菜单(与顶栏策略一致) | ||
| 284 | +#app .sidebar-container { | ||
| 285 | + z-index: 4000 !important; | ||
| 286 | +} | ||
| 287 | + | ||
| 288 | +// 遮罩仅覆盖内容区:让出顶栏 + 侧栏,内容区仍有 dim | ||
| 289 | +body > .v-modal { | ||
| 290 | + top: var(--layout-shell-header-height) !important; | ||
| 291 | + left: var(--layout-shell-sidebar-width) !important; | ||
| 292 | + right: 0 !important; | ||
| 293 | + width: auto !important; | ||
| 294 | + height: auto !important; | ||
| 295 | + bottom: 0 !important; | ||
| 296 | +} | ||
| 297 | + | ||
| 298 | +// 居中大弹窗:限制在「侧栏右侧 + 顶栏/页签下方」的内容区内,避免标题被页签裁切 | ||
| 299 | +// 注意:wrapper 的 display 不要写 !important,否则会压过 Element 关闭时的 inline display:none,导致关不掉/关完又弹出来 | ||
| 300 | +body > .el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper):not(.tags-view-popup-hidden), | ||
| 301 | +.el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper):not(.tags-view-popup-hidden) { | ||
| 302 | + top: var(--layout-shell-header-height) !important; | ||
| 303 | + left: var(--layout-shell-sidebar-width) !important; | ||
| 304 | + right: 0 !important; | ||
| 305 | + bottom: 0 !important; | ||
| 306 | + width: auto !important; | ||
| 307 | + height: auto !important; | ||
| 308 | + padding: 16px 16px 24px !important; | ||
| 309 | + margin: 0 !important; | ||
| 310 | + box-sizing: border-box !important; | ||
| 311 | + align-items: center !important; | ||
| 312 | + justify-content: center !important; | ||
| 313 | + overflow: auto !important; | ||
| 314 | +} | ||
| 315 | + | ||
| 316 | +body > .el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper):not(.tags-view-popup-hidden) .el-dialog, | ||
| 317 | +.el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper):not(.tags-view-popup-hidden) .el-dialog { | ||
| 318 | + margin: auto !important; | ||
| 319 | + max-height: calc(100vh - var(--layout-shell-header-height) - 40px) !important; | ||
| 320 | + display: flex; | ||
| 321 | + flex-direction: column; | ||
| 322 | +} | ||
| 323 | + | ||
| 324 | +body > .el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper) .el-dialog__header, | ||
| 325 | +.el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper) .el-dialog__header, | ||
| 326 | +body > .el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper) .el-dialog__footer, | ||
| 327 | +.el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper) .el-dialog__footer { | ||
| 328 | + flex-shrink: 0; | ||
| 329 | +} | ||
| 330 | + | ||
| 331 | +body > .el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper) .el-dialog__body, | ||
| 332 | +.el-dialog__wrapper.NCC-dialog.NCC-dialog_center:not(.el-message-box__wrapper) .el-dialog__body { | ||
| 333 | + flex: 1 1 auto; | ||
| 334 | + min-height: 0; | ||
| 335 | + // 覆盖 common.scss 的 70vh:高度按内容区剩余空间算,避免再顶出视口 | ||
| 336 | + max-height: none !important; | ||
| 337 | + overflow: auto; | ||
| 338 | +} | ||
| 339 | + | ||
| 340 | +// 弹层 wrapper 点击穿透,仅弹窗/抽屉本体接收事件(保留遮罩点击关闭) | ||
| 341 | +.el-dialog__wrapper:not(.el-message-box__wrapper) { | ||
| 342 | + pointer-events: none; | ||
| 343 | + | ||
| 344 | + .el-dialog { | ||
| 345 | + pointer-events: auto; | ||
| 346 | + } | ||
| 347 | +} | ||
| 348 | + | ||
| 349 | +.el-drawer__wrapper { | ||
| 350 | + pointer-events: none; | ||
| 351 | + | ||
| 352 | + .el-drawer { | ||
| 353 | + pointer-events: auto; | ||
| 354 | + } | ||
| 355 | +} | ||
| 356 | + | ||
| 357 | +// 非当前页签的 body 弹层:隐藏但不销毁,切回页签可恢复 | ||
| 358 | +// 弹窗可用 display:none;遮罩改用透明+禁点击,避免 display:none 导致 z-index 读丢、切回后遮罩无法配对 | ||
| 359 | +body > .el-dialog__wrapper.tags-view-popup-hidden, | ||
| 360 | +body > .el-drawer__wrapper.tags-view-popup-hidden { | ||
| 361 | + display: none !important; | ||
| 362 | +} | ||
| 363 | + | ||
| 364 | +body > .v-modal.tags-view-popup-hidden { | ||
| 365 | + opacity: 0 !important; | ||
| 366 | + visibility: hidden !important; | ||
| 367 | + pointer-events: none !important; | ||
| 368 | +} |
Antis.Erp.Plat/antis-ncc-admin/src/utils/douyinPrintComponent.js
| @@ -418,7 +418,8 @@ export function setDouyinPrintDeviceInfo(deviceId) { | @@ -418,7 +418,8 @@ export function setDouyinPrintDeviceInfo(deviceId) { | ||
| 418 | 418 | ||
| 419 | /** | 419 | /** |
| 420 | * 通过抖店打印组件密文打印电子面单。 | 420 | * 通过抖店打印组件密文打印电子面单。 |
| 421 | - * @param {{ printData: string, sign?: string, printParams?: string, templateUrl?: string, trackNo?: string }} payload | 421 | + * 标准面单密文为 contents 第一段;商品规格自定义区为第二段(有 customTemplateUrl 时)。 |
| 422 | + * @param {{ printData: string, sign?: string, printParams?: string, templateUrl?: string, trackNo?: string, customTemplateUrl?: string, customData?: object }} payload | ||
| 422 | */ | 423 | */ |
| 423 | export async function printWaybillViaLocalComponent(payload, options = {}) { | 424 | export async function printWaybillViaLocalComponent(payload, options = {}) { |
| 424 | if (!payload || !payload.printData) { | 425 | if (!payload || !payload.printData) { |
| @@ -438,12 +439,42 @@ export async function printWaybillViaLocalComponent(payload, options = {}) { | @@ -438,12 +439,42 @@ export async function printWaybillViaLocalComponent(payload, options = {}) { | ||
| 438 | } | 439 | } |
| 439 | localStorage.setItem(PRINTER_STORAGE_KEY, printer) | 440 | localStorage.setItem(PRINTER_STORAGE_KEY, printer) |
| 440 | 441 | ||
| 442 | + // TODO(自定义区-临时关闭):打印组件拉 customTemplateUrl 失败会导致整单失败(如 127.0.0.1:443)。 | ||
| 443 | + // 恢复底部商品规格自定义区时改为 true,并同步取消 WaybillController 里对应清理逻辑。 | ||
| 444 | + const ENABLE_WAYBILL_CUSTOM_AREA = false | ||
| 445 | + | ||
| 441 | const templateURL = | 446 | const templateURL = |
| 442 | payload.templateUrl || | 447 | payload.templateUrl || |
| 443 | 'https://sf3-ttcdn-tos.pstatp.com/obj/logistics-davinci/template/template_76.xml' | 448 | 'https://sf3-ttcdn-tos.pstatp.com/obj/logistics-davinci/template/template_76.xml' |
| 444 | const documentID = payload.trackNo || genRequestId() | 449 | const documentID = payload.trackNo || genRequestId() |
| 445 | const taskID = genRequestId() | 450 | const taskID = genRequestId() |
| 446 | 451 | ||
| 452 | + // 第一段:标准面单密文;商品规格自定义区为第二段(有 customTemplateUrl 时) | ||
| 453 | + const contents = [ | ||
| 454 | + { | ||
| 455 | + templateURL, | ||
| 456 | + params: payload.printParams, | ||
| 457 | + encryptedData: payload.printData, | ||
| 458 | + signature: payload.sign || '', | ||
| 459 | + // 临时关闭自定义区时不传 addData,避免组件仍去拉商家自定义区 | ||
| 460 | + addData: ENABLE_WAYBILL_CUSTOM_AREA ? (payload.customData || undefined) : undefined | ||
| 461 | + } | ||
| 462 | + ] | ||
| 463 | + const customUrl = payload.customTemplateUrl && String(payload.customTemplateUrl).trim() | ||
| 464 | + const customData = payload.customData && typeof payload.customData === 'object' ? payload.customData : null | ||
| 465 | + // TODO(自定义区-临时关闭):恢复时保留下列第二段追加逻辑 | ||
| 466 | + if (ENABLE_WAYBILL_CUSTOM_AREA && customUrl && customData && customUrl !== templateURL) { | ||
| 467 | + contents.push({ | ||
| 468 | + templateURL: customUrl, | ||
| 469 | + data: customData | ||
| 470 | + }) | ||
| 471 | + } else if (ENABLE_WAYBILL_CUSTOM_AREA && !customUrl && customData) { | ||
| 472 | + // 兼容:后端偶发未回 customTemplateUrl 时,前端仍尝试用兜底地址(同源) | ||
| 473 | + console.warn('[douyinPrint] 缺少 customTemplateUrl,底部商品区可能空白') | ||
| 474 | + } else if (!ENABLE_WAYBILL_CUSTOM_AREA) { | ||
| 475 | + console.info('[douyinPrint] 自定义区已临时关闭,仅打印标准面单') | ||
| 476 | + } | ||
| 477 | + | ||
| 447 | const printResp = await sendPrintAndWaitResult( | 478 | const printResp = await sendPrintAndWaitResult( |
| 448 | socket, | 479 | socket, |
| 449 | { | 480 | { |
| @@ -456,14 +487,7 @@ export async function printWaybillViaLocalComponent(payload, options = {}) { | @@ -456,14 +487,7 @@ export async function printWaybillViaLocalComponent(payload, options = {}) { | ||
| 456 | documents: [ | 487 | documents: [ |
| 457 | { | 488 | { |
| 458 | documentID, | 489 | documentID, |
| 459 | - contents: [ | ||
| 460 | - { | ||
| 461 | - templateURL, | ||
| 462 | - params: payload.printParams, | ||
| 463 | - encryptedData: payload.printData, | ||
| 464 | - signature: payload.sign || '' | ||
| 465 | - } | ||
| 466 | - ] | 490 | + contents |
| 467 | } | 491 | } |
| 468 | ] | 492 | ] |
| 469 | } | 493 | } |
Antis.Erp.Plat/antis-ncc-admin/src/utils/get-page-title.js
| @@ -6,10 +6,13 @@ const title = defaultSettings.title | @@ -6,10 +6,13 @@ const title = defaultSettings.title | ||
| 6 | 6 | ||
| 7 | export default function getPageTitle(key, fullName) { | 7 | export default function getPageTitle(key, fullName) { |
| 8 | const realTitle = getLanguage() === 'en' ? 'NCC' : getLanguage() === 'zhtw' ? 'NCC軟件開發平臺' : title | 8 | const realTitle = getLanguage() === 'en' ? 'NCC' : getLanguage() === 'zhtw' ? 'NCC軟件開發平臺' : title |
| 9 | + if (fullName) { | ||
| 10 | + return `${fullName} - ${realTitle}` | ||
| 11 | + } | ||
| 9 | const hasKey = i18n.te(`route.${key}`) | 12 | const hasKey = i18n.te(`route.${key}`) |
| 10 | if (hasKey) { | 13 | if (hasKey) { |
| 11 | const pageName = i18n.t(`route.${key}`) | 14 | const pageName = i18n.t(`route.${key}`) |
| 12 | return `${pageName} - ${realTitle}` | 15 | return `${pageName} - ${realTitle}` |
| 13 | } | 16 | } |
| 14 | - return fullName ? `${fullName} - ${realTitle}` : realTitle | 17 | + return realTitle |
| 15 | } | 18 | } |
| 16 | \ No newline at end of file | 19 | \ No newline at end of file |
Antis.Erp.Plat/antis-ncc-admin/src/utils/i18n.js
| 1 | // translate router.meta.title, be used in breadcrumb sidebar tagsview | 1 | // translate router.meta.title, be used in breadcrumb sidebar tagsview |
| 2 | export function generateTitle(title, fullName) { | 2 | export function generateTitle(title, fullName) { |
| 3 | + // 动态菜单名称优先使用后端 fullName,避免 zh.js 等静态 i18n 覆盖菜单管理里的改名 | ||
| 4 | + if (fullName) { | ||
| 5 | + return fullName | ||
| 6 | + } | ||
| 3 | const hasKey = this.$te('route.' + title) | 7 | const hasKey = this.$te('route.' + title) |
| 4 | - | ||
| 5 | if (hasKey) { | 8 | if (hasKey) { |
| 6 | - // $t :this method from vue-i18n, inject in @/lang/index.js | ||
| 7 | - const translatedTitle = this.$t('route.' + title) | ||
| 8 | - | ||
| 9 | - return translatedTitle | 9 | + return this.$t('route.' + title) |
| 10 | } | 10 | } |
| 11 | - return fullName ? fullName : title | 11 | + return title |
| 12 | } | 12 | } |
| 13 | \ No newline at end of file | 13 | \ No newline at end of file |
Antis.Erp.Plat/antis-ncc-admin/src/utils/request.js
| @@ -13,6 +13,12 @@ const service = axios.create({ | @@ -13,6 +13,12 @@ const service = axios.create({ | ||
| 13 | timeout: define.timeout, // request timeout | 13 | timeout: define.timeout, // request timeout |
| 14 | }) | 14 | }) |
| 15 | 15 | ||
| 16 | +// 登录/单点登录失败由登录页卡片内红条展示,需跳过全局 message 以免重复提示 | ||
| 17 | +function isLoginRequest(url) { | ||
| 18 | + const target = url || '' | ||
| 19 | + return target.indexOf('/api/oauth/Login') > -1 || target.indexOf('/api/oauth/PisLogin') > -1 | ||
| 20 | +} | ||
| 21 | + | ||
| 16 | // request interceptor | 22 | // request interceptor |
| 17 | service.interceptors.request.use( | 23 | service.interceptors.request.use( |
| 18 | config => { | 24 | config => { |
| @@ -65,22 +71,24 @@ service.interceptors.response.use( | @@ -65,22 +71,24 @@ service.interceptors.response.use( | ||
| 65 | // 特殊接口处理 | 71 | // 特殊接口处理 |
| 66 | if (url.indexOf('/Base/DataSource/Actions/Test') > -1 || (url.indexOf('Model') > -1 && url.indexOf('Config') > -1)) return res | 72 | if (url.indexOf('/Base/DataSource/Actions/Test') > -1 || (url.indexOf('Model') > -1 && url.indexOf('Config') > -1)) return res |
| 67 | if (res.code !== 200) { | 73 | if (res.code !== 200) { |
| 68 | - message({ | ||
| 69 | - message: res.msg || '请求出错,请重试', | ||
| 70 | - type: 'error', | ||
| 71 | - duration: 1500, | ||
| 72 | - onClose: () => { | ||
| 73 | - if (url.indexOf('/api/oauth/Login') < 0 && url.indexOf('/api/oauth/LockScreen') < 0 && (res.code === 600 || res.code === 601 || res.code === 602)) { | ||
| 74 | - // 600:登录过期,请重新登录 601: 您的帐号在其他地方已登录,被强制踢出 602: Token验证失败 | ||
| 75 | - store.dispatch('user/resetToken').then(() => { | ||
| 76 | - // hash 路由下登录页地址为 #/login,需判断 hash 而非 pathname, | ||
| 77 | - // 否则已在登录页时仍会被强制刷新,出现闪烁/循环 | ||
| 78 | - if (window.location.hash.indexOf('login') > -1) return | ||
| 79 | - setTimeout(() => { location.reload() }, 100); | ||
| 80 | - }) | 74 | + if (!isLoginRequest(url)) { |
| 75 | + message({ | ||
| 76 | + message: res.msg || '请求出错,请重试', | ||
| 77 | + type: 'error', | ||
| 78 | + duration: 1500, | ||
| 79 | + onClose: () => { | ||
| 80 | + if (url.indexOf('/api/oauth/Login') < 0 && url.indexOf('/api/oauth/LockScreen') < 0 && (res.code === 600 || res.code === 601 || res.code === 602)) { | ||
| 81 | + // 600:登录过期,请重新登录 601: 您的帐号在其他地方已登录,被强制踢出 602: Token验证失败 | ||
| 82 | + store.dispatch('user/resetToken').then(() => { | ||
| 83 | + // hash 路由下登录页地址为 #/login,需判断 hash 而非 pathname, | ||
| 84 | + // 否则已在登录页时仍会被强制刷新,出现闪烁/循环 | ||
| 85 | + if (window.location.hash.indexOf('login') > -1) return | ||
| 86 | + setTimeout(() => { location.reload() }, 100); | ||
| 87 | + }) | ||
| 88 | + } | ||
| 81 | } | 89 | } |
| 82 | - } | ||
| 83 | - }) | 90 | + }) |
| 91 | + } | ||
| 84 | return Promise.reject(new Error(res.msg || 'Error')) | 92 | return Promise.reject(new Error(res.msg || 'Error')) |
| 85 | } else { | 93 | } else { |
| 86 | return res | 94 | return res |
| @@ -90,11 +98,13 @@ service.interceptors.response.use( | @@ -90,11 +98,13 @@ service.interceptors.response.use( | ||
| 90 | if (process.env.NODE_ENV === 'development') { | 98 | if (process.env.NODE_ENV === 'development') { |
| 91 | console.log(error) // for debug | 99 | console.log(error) // for debug |
| 92 | } | 100 | } |
| 93 | - message({ | ||
| 94 | - message: '请求出错,请重试', | ||
| 95 | - type: 'error', | ||
| 96 | - duration: 1500 | ||
| 97 | - }) | 101 | + if (!isLoginRequest(error && error.config && error.config.url)) { |
| 102 | + message({ | ||
| 103 | + message: '请求出错,请重试', | ||
| 104 | + type: 'error', | ||
| 105 | + duration: 1500 | ||
| 106 | + }) | ||
| 107 | + } | ||
| 98 | return Promise.reject(error) | 108 | return Promise.reject(error) |
| 99 | } | 109 | } |
| 100 | ) | 110 | ) |
Antis.Erp.Plat/antis-ncc-admin/src/utils/tagsViewPopupScope.js
0 → 100644
| 1 | +/** | ||
| 2 | + * 多页签(TagsView)下 body 级弹层归属。 | ||
| 3 | + * | ||
| 4 | + * 要点: | ||
| 5 | + * 1) 弹窗 wrapper 按 data-tags-view-path 归属页签;切走只 CSS 隐藏,不关业务 visible。 | ||
| 6 | + * 2) Element UI 的 .v-modal 通常是「全局共用一块」:不可按 path 永久绑死某一页签, | ||
| 7 | + * 否则两个客户档案(_inst 多开)各自打开新建后,反复切换会只剩一个页有遮罩。 | ||
| 8 | + * 3) 遮罩显隐只跟「当前激活页签是否有未关闭弹窗」绑定。 | ||
| 9 | + */ | ||
| 10 | +export const PATH_ATTR = 'data-tags-view-path' | ||
| 11 | +export const Z_ATTR = 'data-tags-view-z' | ||
| 12 | +export const HIDDEN_CLASS = 'tags-view-popup-hidden' | ||
| 13 | + | ||
| 14 | +const BODY_WRAPPER_SELECTOR = | ||
| 15 | + 'body > .el-dialog__wrapper:not(.el-message-box__wrapper), body > .el-drawer__wrapper' | ||
| 16 | + | ||
| 17 | +const ANY_WRAPPER_SELECTOR = '.el-dialog__wrapper:not(.el-message-box__wrapper), .el-drawer__wrapper' | ||
| 18 | + | ||
| 19 | +let activePath = '' | ||
| 20 | +let observer = null | ||
| 21 | +let scheduled = false | ||
| 22 | + | ||
| 23 | +function readDomZIndex(el) { | ||
| 24 | + if (!el || el.nodeType !== 1) return 0 | ||
| 25 | + const inline = el.style && el.style.zIndex | ||
| 26 | + if (inline) { | ||
| 27 | + const n = parseInt(inline, 10) | ||
| 28 | + if (!Number.isNaN(n) && n > 0) return n | ||
| 29 | + } | ||
| 30 | + const z = parseInt(window.getComputedStyle(el).zIndex, 10) | ||
| 31 | + return Number.isNaN(z) ? 0 : z | ||
| 32 | +} | ||
| 33 | + | ||
| 34 | +function readZIndex(el) { | ||
| 35 | + if (!el || el.nodeType !== 1) return 0 | ||
| 36 | + const stored = el.getAttribute(Z_ATTR) | ||
| 37 | + if (stored) { | ||
| 38 | + const n = parseInt(stored, 10) | ||
| 39 | + if (!Number.isNaN(n) && n > 0) return n | ||
| 40 | + } | ||
| 41 | + return readDomZIndex(el) | ||
| 42 | +} | ||
| 43 | + | ||
| 44 | +function rememberZ(el) { | ||
| 45 | + if (!el || el.nodeType !== 1) return 0 | ||
| 46 | + const z = readDomZIndex(el) || readZIndex(el) | ||
| 47 | + if (z > 0) el.setAttribute(Z_ATTR, String(z)) | ||
| 48 | + return z | ||
| 49 | +} | ||
| 50 | + | ||
| 51 | +function isElementUiClosed(wrapper) { | ||
| 52 | + return !!(wrapper && wrapper.style && wrapper.style.display === 'none') | ||
| 53 | +} | ||
| 54 | + | ||
| 55 | +function isBodyLevelWrapper(wrapper) { | ||
| 56 | + return !!(wrapper && wrapper.parentElement === document.body) | ||
| 57 | +} | ||
| 58 | + | ||
| 59 | +function isInPageWrapperVisible(wrapper) { | ||
| 60 | + if (!wrapper || wrapper.nodeType !== 1) return false | ||
| 61 | + if (isElementUiClosed(wrapper)) return false | ||
| 62 | + if (wrapper.classList.contains(HIDDEN_CLASS)) return false | ||
| 63 | + return wrapper.offsetWidth > 0 || wrapper.offsetHeight > 0 | ||
| 64 | +} | ||
| 65 | + | ||
| 66 | +function isScopedBodyWrapper(el) { | ||
| 67 | + if (!el || el.nodeType !== 1) return false | ||
| 68 | + if (!isBodyLevelWrapper(el)) return false | ||
| 69 | + if (el.classList.contains('el-message-box__wrapper')) return false | ||
| 70 | + return el.classList.contains('el-dialog__wrapper') || el.classList.contains('el-drawer__wrapper') | ||
| 71 | +} | ||
| 72 | + | ||
| 73 | +function hasOpenMessageBox() { | ||
| 74 | + let open = false | ||
| 75 | + document.querySelectorAll('body > .el-message-box__wrapper').forEach(box => { | ||
| 76 | + if (!isElementUiClosed(box)) open = true | ||
| 77 | + }) | ||
| 78 | + return open | ||
| 79 | +} | ||
| 80 | + | ||
| 81 | +/** 指定页签是否有业务未关闭的 body 级弹窗(含被 CSS 隐藏的) */ | ||
| 82 | +function hasOpenBodyDialog(path) { | ||
| 83 | + if (!path) return false | ||
| 84 | + let open = false | ||
| 85 | + document.querySelectorAll(BODY_WRAPPER_SELECTOR).forEach(wrapper => { | ||
| 86 | + if (wrapper.getAttribute(PATH_ATTR) !== path) return | ||
| 87 | + if (isElementUiClosed(wrapper)) return | ||
| 88 | + open = true | ||
| 89 | + }) | ||
| 90 | + return open | ||
| 91 | +} | ||
| 92 | + | ||
| 93 | +function hasVisibleInPageDialog() { | ||
| 94 | + let open = false | ||
| 95 | + document.querySelectorAll(ANY_WRAPPER_SELECTOR).forEach(wrapper => { | ||
| 96 | + if (isBodyLevelWrapper(wrapper)) return | ||
| 97 | + if (isInPageWrapperVisible(wrapper)) open = true | ||
| 98 | + }) | ||
| 99 | + return open | ||
| 100 | +} | ||
| 101 | + | ||
| 102 | +/** 当前激活页签是否需要内容区遮罩 */ | ||
| 103 | +function activeTabNeedsMask() { | ||
| 104 | + if (hasOpenMessageBox()) return true | ||
| 105 | + if (activePath && hasOpenBodyDialog(activePath)) return true | ||
| 106 | + if (hasVisibleInPageDialog()) return true | ||
| 107 | + return false | ||
| 108 | +} | ||
| 109 | + | ||
| 110 | +function tagBodyWrapper(wrapper) { | ||
| 111 | + if (!isScopedBodyWrapper(wrapper)) return | ||
| 112 | + if (!wrapper.hasAttribute(PATH_ATTR) && activePath) { | ||
| 113 | + wrapper.setAttribute(PATH_ATTR, activePath) | ||
| 114 | + } | ||
| 115 | + rememberZ(wrapper) | ||
| 116 | +} | ||
| 117 | + | ||
| 118 | +/** | ||
| 119 | + * 多弹窗同时「业务打开」时,Element 共用遮罩的 z-index 往往跟最后打开的弹窗走。 | ||
| 120 | + * 切回较早打开的页签时,要把当前页弹窗抬到遮罩之上,避免被罩住点不到。 | ||
| 121 | + * 注意:不得超过壳层顶栏/侧栏(z-index:4000),否则会盖住页签。 | ||
| 122 | + */ | ||
| 123 | +function ensureActiveDialogAboveModal() { | ||
| 124 | + const SHELL_Z = 4000 | ||
| 125 | + const DIALOG_Z_CAP = SHELL_Z - 10 | ||
| 126 | + | ||
| 127 | + let maxModalZ = 0 | ||
| 128 | + document.querySelectorAll('body > .v-modal').forEach(modal => { | ||
| 129 | + if (modal.classList.contains(HIDDEN_CLASS)) return | ||
| 130 | + maxModalZ = Math.max(maxModalZ, readZIndex(modal) || rememberZ(modal)) | ||
| 131 | + }) | ||
| 132 | + if (maxModalZ <= 0) return | ||
| 133 | + | ||
| 134 | + document.querySelectorAll(BODY_WRAPPER_SELECTOR).forEach(wrapper => { | ||
| 135 | + if (wrapper.getAttribute(PATH_ATTR) !== activePath) return | ||
| 136 | + if (isElementUiClosed(wrapper)) return | ||
| 137 | + if (wrapper.classList.contains(HIDDEN_CLASS)) return | ||
| 138 | + const wz = rememberZ(wrapper) | ||
| 139 | + if (wz > 0 && wz <= maxModalZ) { | ||
| 140 | + const next = Math.min(maxModalZ + 1, DIALOG_Z_CAP) | ||
| 141 | + if (next > wz) { | ||
| 142 | + wrapper.style.zIndex = String(next) | ||
| 143 | + wrapper.setAttribute(Z_ATTR, String(next)) | ||
| 144 | + } | ||
| 145 | + } | ||
| 146 | + }) | ||
| 147 | +} | ||
| 148 | + | ||
| 149 | +function applyVisibility() { | ||
| 150 | + document.querySelectorAll(BODY_WRAPPER_SELECTOR).forEach(tagBodyWrapper) | ||
| 151 | + | ||
| 152 | + // 弹窗:非当前页签隐藏;Element 已关闭(inline display:none)也必须加隐藏类 | ||
| 153 | + // 避免壳层定位样式与关闭态冲突,出现「关掉又弹出来 / 关不掉」 | ||
| 154 | + document.querySelectorAll(BODY_WRAPPER_SELECTOR).forEach(wrapper => { | ||
| 155 | + const path = wrapper.getAttribute(PATH_ATTR) | ||
| 156 | + if (!path) { | ||
| 157 | + if (isElementUiClosed(wrapper)) wrapper.classList.add(HIDDEN_CLASS) | ||
| 158 | + return | ||
| 159 | + } | ||
| 160 | + const hide = path !== activePath || isElementUiClosed(wrapper) | ||
| 161 | + wrapper.classList.toggle(HIDDEN_CLASS, hide) | ||
| 162 | + }) | ||
| 163 | + | ||
| 164 | + // 遮罩:Element 常共用一块,只跟「当前页是否有打开弹窗」绑定 | ||
| 165 | + const needMask = activeTabNeedsMask() | ||
| 166 | + document.querySelectorAll('body > .v-modal').forEach(modal => { | ||
| 167 | + rememberZ(modal) | ||
| 168 | + if (hasOpenMessageBox()) { | ||
| 169 | + modal.classList.remove(HIDDEN_CLASS) | ||
| 170 | + return | ||
| 171 | + } | ||
| 172 | + modal.classList.toggle(HIDDEN_CLASS, !needMask) | ||
| 173 | + }) | ||
| 174 | + | ||
| 175 | + if (needMask) ensureActiveDialogAboveModal() | ||
| 176 | + | ||
| 177 | + syncBodyPopupLock(needMask) | ||
| 178 | +} | ||
| 179 | + | ||
| 180 | +function syncBodyPopupLock(needMask) { | ||
| 181 | + if (typeof document === 'undefined') return | ||
| 182 | + const lock = !!(needMask || hasOpenMessageBox()) | ||
| 183 | + if (lock) document.body.classList.add('el-popup-parent--hidden') | ||
| 184 | + else document.body.classList.remove('el-popup-parent--hidden') | ||
| 185 | +} | ||
| 186 | + | ||
| 187 | +function scheduleSync() { | ||
| 188 | + if (scheduled) return | ||
| 189 | + scheduled = true | ||
| 190 | + const run = () => { | ||
| 191 | + scheduled = false | ||
| 192 | + applyVisibility() | ||
| 193 | + } | ||
| 194 | + if (typeof requestAnimationFrame === 'function') { | ||
| 195 | + requestAnimationFrame(run) | ||
| 196 | + } else { | ||
| 197 | + setTimeout(run, 0) | ||
| 198 | + } | ||
| 199 | +} | ||
| 200 | + | ||
| 201 | +function onMutation(mutations) { | ||
| 202 | + let touched = false | ||
| 203 | + mutations.forEach(mutation => { | ||
| 204 | + if (mutation.type === 'attributes') { | ||
| 205 | + const el = mutation.target | ||
| 206 | + // 只关心 body 直挂的弹窗/遮罩(Element 关闭时改 style.display) | ||
| 207 | + if (el && el.parentElement === document.body) { | ||
| 208 | + if (isScopedBodyWrapper(el) || (el.classList && el.classList.contains('v-modal'))) { | ||
| 209 | + touched = true | ||
| 210 | + } | ||
| 211 | + } | ||
| 212 | + return | ||
| 213 | + } | ||
| 214 | + mutation.addedNodes.forEach(node => { | ||
| 215 | + if (node.nodeType !== 1) return | ||
| 216 | + if (isScopedBodyWrapper(node) || (node.classList && node.classList.contains('v-modal'))) { | ||
| 217 | + if (isScopedBodyWrapper(node)) tagBodyWrapper(node) | ||
| 218 | + else rememberZ(node) | ||
| 219 | + touched = true | ||
| 220 | + } | ||
| 221 | + }) | ||
| 222 | + mutation.removedNodes.forEach(node => { | ||
| 223 | + if (node.nodeType !== 1) return | ||
| 224 | + if ((node.classList && node.classList.contains('v-modal')) || isScopedBodyWrapper(node)) { | ||
| 225 | + touched = true | ||
| 226 | + } | ||
| 227 | + }) | ||
| 228 | + }) | ||
| 229 | + if (touched) scheduleSync() | ||
| 230 | +} | ||
| 231 | + | ||
| 232 | +function onRouteChange(to) { | ||
| 233 | + activePath = (to && to.fullPath) || '' | ||
| 234 | + scheduleSync() | ||
| 235 | +} | ||
| 236 | + | ||
| 237 | +/** | ||
| 238 | + * @param {import('vue-router').default} router | ||
| 239 | + */ | ||
| 240 | +export function initTagsViewPopupScope(router) { | ||
| 241 | + if (typeof document === 'undefined' || !router) return | ||
| 242 | + | ||
| 243 | + activePath = router.currentRoute && router.currentRoute.fullPath ? router.currentRoute.fullPath : '' | ||
| 244 | + | ||
| 245 | + if (!observer && typeof MutationObserver !== 'undefined') { | ||
| 246 | + observer = new MutationObserver(onMutation) | ||
| 247 | + observer.observe(document.body, { | ||
| 248 | + childList: true, | ||
| 249 | + subtree: true, | ||
| 250 | + attributes: true, | ||
| 251 | + attributeFilter: ['style', 'class'] | ||
| 252 | + }) | ||
| 253 | + } | ||
| 254 | + | ||
| 255 | + router.afterEach(to => { | ||
| 256 | + onRouteChange(to) | ||
| 257 | + }) | ||
| 258 | + | ||
| 259 | + scheduleSync() | ||
| 260 | +} | ||
| 261 | + | ||
| 262 | +export function __tagsViewPopupScopeTestHooks() { | ||
| 263 | + return { | ||
| 264 | + onRouteChange, | ||
| 265 | + applyVisibility, | ||
| 266 | + tagWrapper: tagBodyWrapper, | ||
| 267 | + getActivePath: () => activePath, | ||
| 268 | + HIDDEN_CLASS, | ||
| 269 | + PATH_ATTR, | ||
| 270 | + activeTabNeedsMask | ||
| 271 | + } | ||
| 272 | +} |
Antis.Erp.Plat/antis-ncc-admin/src/utils/wtFpsqApi.js
0 → 100644
| 1 | +import request from '@/utils/request' | ||
| 2 | + | ||
| 3 | +/** 提交申请 → 待财务开票 */ | ||
| 4 | +export function postFpsqSubmitForAudit(id) { | ||
| 5 | + return request({ | ||
| 6 | + url: `/api/Extend/WtFpsq/Actions/SubmitForAudit/${id}`, | ||
| 7 | + method: 'POST', | ||
| 8 | + data: {} | ||
| 9 | + }) | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +/** 财务确认开出 → 已开票待确认 */ | ||
| 13 | +export function postFpsqConfirmIssued(id, body) { | ||
| 14 | + const payload = body || {} | ||
| 15 | + return request({ | ||
| 16 | + url: `/api/Extend/WtFpsq/Actions/ConfirmIssued/${id}`, | ||
| 17 | + method: 'POST', | ||
| 18 | + data: { | ||
| 19 | + fphm: payload.fphm != null ? String(payload.fphm).trim() : '', | ||
| 20 | + kprq: payload.kprq != null && payload.kprq !== '' ? payload.kprq : undefined, | ||
| 21 | + remark: payload.remark != null ? String(payload.remark).trim() : undefined | ||
| 22 | + } | ||
| 23 | + }) | ||
| 24 | +} | ||
| 25 | + | ||
| 26 | +/** 申请人确认完结 → 已完结 */ | ||
| 27 | +export function postFpsqConfirmDone(id) { | ||
| 28 | + return request({ | ||
| 29 | + url: `/api/Extend/WtFpsq/Actions/ConfirmDone/${id}`, | ||
| 30 | + method: 'POST', | ||
| 31 | + data: {} | ||
| 32 | + }) | ||
| 33 | +} |
Antis.Erp.Plat/antis-ncc-admin/src/utils/wtFpsqDjztDisplay.js
0 → 100644
| 1 | +import { hasWtRejectSpbzMarker, isWtDjztRejected } from '@/utils/wtDjztDisplay' | ||
| 2 | + | ||
| 3 | +/** 发票申请新流程状态 */ | ||
| 4 | +export const WT_FPSQ_STATUS = { | ||
| 5 | + PENDING_FINANCE: '待财务开票', | ||
| 6 | + PENDING_CONFIRM: '已开票待确认', | ||
| 7 | + DONE: '已完结', | ||
| 8 | + REJECTED: '已驳回' | ||
| 9 | +} | ||
| 10 | + | ||
| 11 | +function normalizeDjzt(djzt) { | ||
| 12 | + return djzt == null ? '' : String(djzt).trim() | ||
| 13 | +} | ||
| 14 | + | ||
| 15 | +/** | ||
| 16 | + * 发票申请展示状态(含旧「待审核/已审核/审核不通过」兼容) | ||
| 17 | + */ | ||
| 18 | +export function getWtFpsqDjztDisplayLabel(djzt, spbz) { | ||
| 19 | + const z = normalizeDjzt(djzt) | ||
| 20 | + if (isWtDjztRejected(z, spbz) || z === '审核不通过') return WT_FPSQ_STATUS.REJECTED | ||
| 21 | + if (z === '待审核' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级') { | ||
| 22 | + return WT_FPSQ_STATUS.PENDING_FINANCE | ||
| 23 | + } | ||
| 24 | + if (z === '已审核') return WT_FPSQ_STATUS.DONE | ||
| 25 | + if (!z || z === '草稿') return '草稿' | ||
| 26 | + if ( | ||
| 27 | + z === WT_FPSQ_STATUS.PENDING_FINANCE || | ||
| 28 | + z === WT_FPSQ_STATUS.PENDING_CONFIRM || | ||
| 29 | + z === WT_FPSQ_STATUS.DONE || | ||
| 30 | + z === WT_FPSQ_STATUS.REJECTED | ||
| 31 | + ) { | ||
| 32 | + return z | ||
| 33 | + } | ||
| 34 | + return z | ||
| 35 | +} | ||
| 36 | + | ||
| 37 | +export function getWtFpsqDjztTagType(djzt, spbz) { | ||
| 38 | + const label = getWtFpsqDjztDisplayLabel(djzt, spbz) | ||
| 39 | + if (label === WT_FPSQ_STATUS.DONE) return 'success' | ||
| 40 | + if (label === '草稿') return 'info' | ||
| 41 | + if (label === WT_FPSQ_STATUS.REJECTED) return 'danger' | ||
| 42 | + if (label === WT_FPSQ_STATUS.PENDING_CONFIRM) return 'warning' | ||
| 43 | + if (label === WT_FPSQ_STATUS.PENDING_FINANCE) return 'warning' | ||
| 44 | + return 'info' | ||
| 45 | +} | ||
| 46 | + | ||
| 47 | +/** 是否处于财务待开票(含旧待审核) */ | ||
| 48 | +export function isFpsqPendingFinance(djzt) { | ||
| 49 | + const z = normalizeDjzt(djzt) | ||
| 50 | + return !z || z === '待审核' || z === '待财务开票' || z === '一级已审' || z === '待二级' || z === '一级已审/待二级' | ||
| 51 | +} | ||
| 52 | + | ||
| 53 | +/** 是否已开票待申请人确认 */ | ||
| 54 | +export function isFpsqPendingConfirm(djzt) { | ||
| 55 | + return normalizeDjzt(djzt) === WT_FPSQ_STATUS.PENDING_CONFIRM | ||
| 56 | +} | ||
| 57 | + | ||
| 58 | +/** 列表编辑:草稿 / 已驳回 */ | ||
| 59 | +export function canFpsqEdit(djzt, spbz) { | ||
| 60 | + const label = getWtFpsqDjztDisplayLabel(djzt, spbz) | ||
| 61 | + return label === '草稿' || label === WT_FPSQ_STATUS.REJECTED | ||
| 62 | +} | ||
| 63 | + | ||
| 64 | +export function canFpsqDelete(djzt, spbz) { | ||
| 65 | + return canFpsqEdit(djzt, spbz) | ||
| 66 | +} | ||
| 67 | + | ||
| 68 | +export function canFpsqSubmit(djzt, spbz) { | ||
| 69 | + return canFpsqEdit(djzt, spbz) | ||
| 70 | +} |
Antis.Erp.Plat/antis-ncc-admin/src/utils/wtRejectApproval.js
| @@ -188,6 +188,24 @@ export function postCzdReject(id, remark) { | @@ -188,6 +188,24 @@ export function postCzdReject(id, remark) { | ||
| 188 | }) | 188 | }) |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | +/** 门店支出单:审核通过 */ | ||
| 192 | +export function postMdzcdApprove(id, remark) { | ||
| 193 | + return request({ | ||
| 194 | + url: `/api/Extend/WtMdzcd/Actions/Approve/${id}`, | ||
| 195 | + method: 'POST', | ||
| 196 | + data: { remark: remark || '' } | ||
| 197 | + }) | ||
| 198 | +} | ||
| 199 | + | ||
| 200 | +/** 门店支出单:审核不通过 */ | ||
| 201 | +export function postMdzcdReject(id, remark) { | ||
| 202 | + return request({ | ||
| 203 | + url: `/api/Extend/WtMdzcd/Actions/Reject/${id}`, | ||
| 204 | + method: 'POST', | ||
| 205 | + data: { remark: remark || '' } | ||
| 206 | + }) | ||
| 207 | +} | ||
| 208 | + | ||
| 191 | /** 拆装单:反审(已审核 → 草稿) */ | 209 | /** 拆装单:反审(已审核 → 草稿) */ |
| 192 | export function postCzdReverse(id) { | 210 | export function postCzdReverse(id) { |
| 193 | return request({ | 211 | return request({ |
Antis.Erp.Plat/antis-ncc-admin/src/views/MyCouponUseHistory/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/MyCouponUseHistory/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="medium" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="medium" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseAntisEvents/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseAntisEvents/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseBusiness/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="800px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="800px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseBusiness/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="1200px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="1200px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="12"> | 5 | <el-col :span="12"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseMyCoupon/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseMyCoupon/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseOrder/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseOrder/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="medium" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="medium" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="12"> | 5 | <el-col :span="12"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseProduct copy/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseProduct copy/Form.vue
| @@ -5,8 +5,7 @@ | @@ -5,8 +5,7 @@ | ||
| 5 | :visible.sync="visible" | 5 | :visible.sync="visible" |
| 6 | class="NCC-dialog NCC-dialog_center" | 6 | class="NCC-dialog NCC-dialog_center" |
| 7 | lock-scroll | 7 | lock-scroll |
| 8 | - width="1200px" | ||
| 9 | - > | 8 | + width="1200px" append-to-body modal-append-to-body> |
| 10 | <el-row :gutter="15" class=""> | 9 | <el-row :gutter="15" class=""> |
| 11 | <el-form | 10 | <el-form |
| 12 | ref="elForm" | 11 | ref="elForm" |
Antis.Erp.Plat/antis-ncc-admin/src/views/baseProduct/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/dashboard/Setting.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-drawer title="切换门户" :visible.sync="drawer" direction="rtl" size="260px" | 2 | <el-drawer title="切换门户" :visible.sync="drawer" direction="rtl" size="260px" |
| 3 | - class="NCC-common-drawer board"> | 3 | + class="NCC-common-drawer board" append-to-body modal-append-to-body> |
| 4 | <div class="main" v-loading="loading" :element-loading-text="loadingText"> | 4 | <div class="main" v-loading="loading" :element-loading-text="loadingText"> |
| 5 | <div v-if="list.length"> | 5 | <div v-if="list.length"> |
| 6 | <div class="item" v-for="(item,i) in list" :key="i"> | 6 | <div class="item" v-for="(item,i) in list" :key="i"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/dashboard/index.vue
| 1 | <template> | 1 | <template> |
| 2 | <div class="dashboard-container"> | 2 | <div class="dashboard-container"> |
| 3 | <div class="dashboard-body"> | 3 | <div class="dashboard-body"> |
| 4 | - <!-- 顶部欢迎卡片 --> | ||
| 5 | - <div class="dashboard-hero"> | 4 | + <section class="dashboard-hero" aria-label="欢迎"> |
| 6 | <div class="dashboard-hero__bg" aria-hidden="true"> | 5 | <div class="dashboard-hero__bg" aria-hidden="true"> |
| 7 | <span class="dashboard-hero__orb dashboard-hero__orb--1" /> | 6 | <span class="dashboard-hero__orb dashboard-hero__orb--1" /> |
| 8 | <span class="dashboard-hero__orb dashboard-hero__orb--2" /> | 7 | <span class="dashboard-hero__orb dashboard-hero__orb--2" /> |
| 8 | + <span class="dashboard-hero__grid" /> | ||
| 9 | </div> | 9 | </div> |
| 10 | <div class="dashboard-hero__content"> | 10 | <div class="dashboard-hero__content"> |
| 11 | - <div class="dashboard-hero__avatar"> | ||
| 12 | - <i class="el-icon-user-solid" /> | 11 | + <div class="dashboard-hero__brand"> |
| 12 | + <img | ||
| 13 | + class="dashboard-hero__logo" | ||
| 14 | + src="@/assets/images/lll.jpg" | ||
| 15 | + alt="PongGame" | ||
| 16 | + > | ||
| 13 | </div> | 17 | </div> |
| 14 | <div class="dashboard-hero__text"> | 18 | <div class="dashboard-hero__text"> |
| 15 | - <p class="dashboard-hero__greeting">{{ greetingText }},欢迎回来{{ welcomeName }}</p> | ||
| 16 | - <h2 class="dashboard-hero__title">PongGame 资源管理平台</h2> | ||
| 17 | - <p class="dashboard-hero__subtitle">{{ todayLabel }} · 请从左侧菜单进入对应业务功能</p> | 19 | + <p class="dashboard-hero__greeting"> |
| 20 | + <span class="dashboard-hero__greeting-badge">{{ greetingText }}</span> | ||
| 21 | + 欢迎回来{{ welcomeName }} | ||
| 22 | + </p> | ||
| 23 | + <h1 class="dashboard-hero__title">PongGame 资源管理平台</h1> | ||
| 24 | + <p class="dashboard-hero__subtitle"> | ||
| 25 | + <i class="el-icon-date" aria-hidden="true" /> | ||
| 26 | + {{ todayLabel }} | ||
| 27 | + <span class="dashboard-hero__subtitle-sep">·</span> | ||
| 28 | + 请从左侧菜单进入对应业务功能 | ||
| 29 | + </p> | ||
| 18 | </div> | 30 | </div> |
| 19 | </div> | 31 | </div> |
| 20 | - </div> | 32 | + </section> |
| 21 | 33 | ||
| 22 | - <!-- 本次登录信息 --> | ||
| 23 | - <div class="dashboard-login-info"> | ||
| 24 | - <div class="dashboard-login-info__head"> | ||
| 25 | - <i class="el-icon-user" /> | ||
| 26 | - <span>本次登录信息</span> | ||
| 27 | - </div> | ||
| 28 | - <div class="dashboard-login-info__grid"> | ||
| 29 | - <div class="dashboard-login-info__item"> | ||
| 30 | - <span class="dashboard-login-info__label">登录账号</span> | ||
| 31 | - <span class="dashboard-login-info__value">{{ loginInfo.account }}</span> | ||
| 32 | - </div> | ||
| 33 | - <div class="dashboard-login-info__item"> | ||
| 34 | - <span class="dashboard-login-info__label">用户姓名</span> | ||
| 35 | - <span class="dashboard-login-info__value">{{ loginInfo.name }}</span> | ||
| 36 | - </div> | ||
| 37 | - <div class="dashboard-login-info__item"> | ||
| 38 | - <span class="dashboard-login-info__label">登录时间</span> | ||
| 39 | - <span class="dashboard-login-info__value">{{ loginInfo.time }}</span> | ||
| 40 | - </div> | ||
| 41 | - <div class="dashboard-login-info__item"> | ||
| 42 | - <span class="dashboard-login-info__label">登录环境</span> | ||
| 43 | - <span class="dashboard-login-info__value">{{ loginInfo.agent }}</span> | ||
| 44 | - </div> | ||
| 45 | - </div> | ||
| 46 | - </div> | 34 | + <section class="dashboard-login-info" aria-label="本次登录信息"> |
| 35 | + <header class="dashboard-login-info__head"> | ||
| 36 | + <span class="dashboard-login-info__head-icon"> | ||
| 37 | + <i class="el-icon-user" aria-hidden="true" /> | ||
| 38 | + </span> | ||
| 39 | + <span class="dashboard-login-info__head-title">本次登录信息</span> | ||
| 40 | + </header> | ||
| 41 | + <ul class="dashboard-login-info__grid"> | ||
| 42 | + <li class="dashboard-login-info__item"> | ||
| 43 | + <span class="dashboard-login-info__icon dashboard-login-info__icon--account"> | ||
| 44 | + <i class="el-icon-s-custom" aria-hidden="true" /> | ||
| 45 | + </span> | ||
| 46 | + <div class="dashboard-login-info__meta"> | ||
| 47 | + <span class="dashboard-login-info__label">登录账号</span> | ||
| 48 | + <span class="dashboard-login-info__value">{{ loginInfo.account }}</span> | ||
| 49 | + </div> | ||
| 50 | + </li> | ||
| 51 | + <li class="dashboard-login-info__item"> | ||
| 52 | + <span class="dashboard-login-info__icon dashboard-login-info__icon--name"> | ||
| 53 | + <i class="el-icon-user-solid" aria-hidden="true" /> | ||
| 54 | + </span> | ||
| 55 | + <div class="dashboard-login-info__meta"> | ||
| 56 | + <span class="dashboard-login-info__label">用户姓名</span> | ||
| 57 | + <span class="dashboard-login-info__value">{{ loginInfo.name }}</span> | ||
| 58 | + </div> | ||
| 59 | + </li> | ||
| 60 | + <li class="dashboard-login-info__item"> | ||
| 61 | + <span class="dashboard-login-info__icon dashboard-login-info__icon--time"> | ||
| 62 | + <i class="el-icon-time" aria-hidden="true" /> | ||
| 63 | + </span> | ||
| 64 | + <div class="dashboard-login-info__meta"> | ||
| 65 | + <span class="dashboard-login-info__label">登录时间</span> | ||
| 66 | + <span class="dashboard-login-info__value">{{ loginInfo.time }}</span> | ||
| 67 | + </div> | ||
| 68 | + </li> | ||
| 69 | + <li class="dashboard-login-info__item"> | ||
| 70 | + <span class="dashboard-login-info__icon dashboard-login-info__icon--env"> | ||
| 71 | + <i class="el-icon-monitor" aria-hidden="true" /> | ||
| 72 | + </span> | ||
| 73 | + <div class="dashboard-login-info__meta"> | ||
| 74 | + <span class="dashboard-login-info__label">登录环境</span> | ||
| 75 | + <span class="dashboard-login-info__value">{{ loginInfo.agent }}</span> | ||
| 76 | + </div> | ||
| 77 | + </li> | ||
| 78 | + </ul> | ||
| 79 | + </section> | ||
| 47 | </div> | 80 | </div> |
| 48 | </div> | 81 | </div> |
| 49 | </template> | 82 | </template> |
| 50 | 83 | ||
| 51 | <script> | 84 | <script> |
| 52 | import { getAuthPortal } from '@/api/onlineDev/portal' | 85 | import { getAuthPortal } from '@/api/onlineDev/portal' |
| 53 | -import Setting from './Setting' | ||
| 54 | -import PortalLayout from '@/components/VisualPortal/Layout' | ||
| 55 | import { mapGetters } from 'vuex' | 86 | import { mapGetters } from 'vuex' |
| 56 | 87 | ||
| 57 | export default { | 88 | export default { |
| 58 | name: 'dashboard', | 89 | name: 'dashboard', |
| 59 | - components: { Setting, PortalLayout }, | ||
| 60 | data() { | 90 | data() { |
| 61 | return { | 91 | return { |
| 62 | portalId: '', | 92 | portalId: '', |
| @@ -83,14 +113,13 @@ export default { | @@ -83,14 +113,13 @@ export default { | ||
| 83 | return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日 星期${weekNames[d.getDay()]}` | 113 | return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日 星期${weekNames[d.getDay()]}` |
| 84 | }, | 114 | }, |
| 85 | loginInfo() { | 115 | loginInfo() { |
| 86 | - // CurrentUser 字段为 userAccount / userName(无 account / realName) | ||
| 87 | const account = this.resolveUserAccount() | 116 | const account = this.resolveUserAccount() |
| 88 | const name = this.resolveUserDisplayName() | 117 | const name = this.resolveUserDisplayName() |
| 89 | const time = this.resolveLoginTimeText() | 118 | const time = this.resolveLoginTimeText() |
| 90 | const agent = this.getLoginAgentText() | 119 | const agent = this.getLoginAgentText() |
| 91 | return { | 120 | return { |
| 92 | - account: account || '-', | ||
| 93 | - name: name || '-', | 121 | + account: account || '无', |
| 122 | + name: name || '无', | ||
| 94 | time, | 123 | time, |
| 95 | agent | 124 | agent |
| 96 | } | 125 | } |
| @@ -142,7 +171,7 @@ export default { | @@ -142,7 +171,7 @@ export default { | ||
| 142 | } | 171 | } |
| 143 | getAuthPortal(this.portalId).then(res => { | 172 | getAuthPortal(this.portalId).then(res => { |
| 144 | if (res.data && res.data.formData) { | 173 | if (res.data && res.data.formData) { |
| 145 | - let formData = JSON.parse(res.data.formData) | 174 | + const formData = JSON.parse(res.data.formData) |
| 146 | this.layout = formData.layout || [] | 175 | this.layout = formData.layout || [] |
| 147 | } | 176 | } |
| 148 | this.ajaxing = false | 177 | this.ajaxing = false |
| @@ -157,210 +186,310 @@ export default { | @@ -157,210 +186,310 @@ export default { | ||
| 157 | } | 186 | } |
| 158 | } | 187 | } |
| 159 | </script> | 188 | </script> |
| 189 | + | ||
| 160 | <style lang="scss" scoped> | 190 | <style lang="scss" scoped> |
| 191 | +/* 项目主题蓝;logo 图片保持原色 */ | ||
| 192 | +$color-primary: #1890ff; | ||
| 193 | +$color-primary-light: #53a8ff; | ||
| 194 | +$color-primary-lighter: #79bbff; | ||
| 195 | +$text-muted: #909399; | ||
| 196 | +$text-dark: #303133; | ||
| 197 | +$card-radius: 12px; | ||
| 198 | + | ||
| 161 | .dashboard-container { | 199 | .dashboard-container { |
| 162 | width: 100%; | 200 | width: 100%; |
| 163 | min-height: 100%; | 201 | min-height: 100%; |
| 164 | - background: #ebeef5; | 202 | + background: linear-gradient(180deg, #f5f6f8 0%, #ebeef5 100%); |
| 165 | position: relative; | 203 | position: relative; |
| 166 | overflow: auto; | 204 | overflow: auto; |
| 205 | +} | ||
| 167 | 206 | ||
| 168 | - .dashboard-body { | ||
| 169 | - padding: 20px 24px 32px; | ||
| 170 | - max-width: 1200px; | ||
| 171 | - margin: 0 auto; | 207 | +.dashboard-body { |
| 208 | + padding: 24px 28px 40px; | ||
| 209 | + max-width: 960px; | ||
| 210 | + margin: 0 auto; | ||
| 211 | +} | ||
| 212 | + | ||
| 213 | +.dashboard-hero { | ||
| 214 | + position: relative; | ||
| 215 | + overflow: hidden; | ||
| 216 | + border-radius: $card-radius; | ||
| 217 | + padding: 28px 32px; | ||
| 218 | + margin-bottom: 20px; | ||
| 219 | + background: linear-gradient(135deg, $color-primary 0%, $color-primary-light 45%, $color-primary-lighter 100%); | ||
| 220 | + box-shadow: 0 10px 32px rgba($color-primary, 0.22); | ||
| 221 | + color: #fff; | ||
| 222 | +} | ||
| 223 | + | ||
| 224 | +.dashboard-hero__bg { | ||
| 225 | + position: absolute; | ||
| 226 | + inset: 0; | ||
| 227 | + pointer-events: none; | ||
| 228 | +} | ||
| 229 | + | ||
| 230 | +.dashboard-hero__grid { | ||
| 231 | + position: absolute; | ||
| 232 | + inset: 0; | ||
| 233 | + background-image: | ||
| 234 | + linear-gradient(rgba(255, 255, 255, 0.04) 1px, transparent 1px), | ||
| 235 | + linear-gradient(90deg, rgba(255, 255, 255, 0.04) 1px, transparent 1px); | ||
| 236 | + background-size: 40px 40px; | ||
| 237 | +} | ||
| 238 | + | ||
| 239 | +.dashboard-hero__orb { | ||
| 240 | + position: absolute; | ||
| 241 | + border-radius: 50%; | ||
| 242 | + background: rgba(255, 255, 255, 0.1); | ||
| 243 | + | ||
| 244 | + &--1 { | ||
| 245 | + width: 200px; | ||
| 246 | + height: 200px; | ||
| 247 | + top: -70px; | ||
| 248 | + right: -30px; | ||
| 172 | } | 249 | } |
| 173 | 250 | ||
| 174 | - .dashboard-hero { | ||
| 175 | - position: relative; | ||
| 176 | - overflow: hidden; | ||
| 177 | - border-radius: 12px; | ||
| 178 | - padding: 24px 28px; | ||
| 179 | - margin-bottom: 16px; | ||
| 180 | - background: linear-gradient(135deg, #409eff 0%, #53a8ff 45%, #79bbff 100%); | ||
| 181 | - box-shadow: 0 8px 24px rgba(64, 158, 255, 0.22); | ||
| 182 | - color: #fff; | ||
| 183 | - | ||
| 184 | - &__bg { | ||
| 185 | - position: absolute; | ||
| 186 | - inset: 0; | ||
| 187 | - pointer-events: none; | ||
| 188 | - } | 251 | + &--2 { |
| 252 | + width: 140px; | ||
| 253 | + height: 140px; | ||
| 254 | + bottom: -50px; | ||
| 255 | + right: 100px; | ||
| 256 | + background: rgba(255, 255, 255, 0.06); | ||
| 257 | + } | ||
| 258 | +} | ||
| 189 | 259 | ||
| 190 | - &__orb { | ||
| 191 | - position: absolute; | ||
| 192 | - border-radius: 50%; | ||
| 193 | - background: rgba(255, 255, 255, 0.12); | 260 | +.dashboard-hero__content { |
| 261 | + position: relative; | ||
| 262 | + z-index: 1; | ||
| 263 | + display: flex; | ||
| 264 | + align-items: center; | ||
| 265 | + gap: 24px; | ||
| 266 | +} | ||
| 194 | 267 | ||
| 195 | - &--1 { | ||
| 196 | - width: 180px; | ||
| 197 | - height: 180px; | ||
| 198 | - top: -60px; | ||
| 199 | - right: -20px; | ||
| 200 | - } | 268 | +.dashboard-hero__brand { |
| 269 | + flex-shrink: 0; | ||
| 270 | +} | ||
| 201 | 271 | ||
| 202 | - &--2 { | ||
| 203 | - width: 120px; | ||
| 204 | - height: 120px; | ||
| 205 | - bottom: -40px; | ||
| 206 | - right: 120px; | ||
| 207 | - background: rgba(255, 255, 255, 0.08); | ||
| 208 | - } | ||
| 209 | - } | 272 | +.dashboard-hero__logo { |
| 273 | + display: block; | ||
| 274 | + width: 88px; | ||
| 275 | + height: 88px; | ||
| 276 | + border-radius: 14px; | ||
| 277 | + object-fit: cover; | ||
| 278 | + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.22); | ||
| 279 | + border: 2px solid rgba(255, 255, 255, 0.25); | ||
| 280 | +} | ||
| 210 | 281 | ||
| 211 | - &__content { | ||
| 212 | - position: relative; | ||
| 213 | - z-index: 1; | ||
| 214 | - display: flex; | ||
| 215 | - align-items: center; | ||
| 216 | - gap: 20px; | ||
| 217 | - } | 282 | +.dashboard-hero__text { |
| 283 | + min-width: 0; | ||
| 284 | + flex: 1; | ||
| 285 | +} | ||
| 218 | 286 | ||
| 219 | - &__avatar { | ||
| 220 | - width: 64px; | ||
| 221 | - height: 64px; | ||
| 222 | - border-radius: 50%; | ||
| 223 | - background: rgba(255, 255, 255, 0.2); | ||
| 224 | - display: flex; | ||
| 225 | - align-items: center; | ||
| 226 | - justify-content: center; | ||
| 227 | - flex-shrink: 0; | ||
| 228 | - font-size: 30px; | ||
| 229 | - border: 2px solid rgba(255, 255, 255, 0.35); | ||
| 230 | - } | 287 | +.dashboard-hero__greeting { |
| 288 | + display: flex; | ||
| 289 | + flex-wrap: wrap; | ||
| 290 | + align-items: center; | ||
| 291 | + gap: 8px; | ||
| 292 | + margin: 0 0 10px; | ||
| 293 | + font-size: 14px; | ||
| 294 | + line-height: 1.5; | ||
| 295 | + color: rgba(255, 255, 255, 0.92); | ||
| 296 | +} | ||
| 231 | 297 | ||
| 232 | - &__greeting { | ||
| 233 | - margin: 0 0 6px; | ||
| 234 | - font-size: 14px; | ||
| 235 | - opacity: 0.92; | ||
| 236 | - } | 298 | +.dashboard-hero__greeting-badge { |
| 299 | + display: inline-block; | ||
| 300 | + padding: 2px 10px; | ||
| 301 | + font-size: 12px; | ||
| 302 | + font-weight: 600; | ||
| 303 | + line-height: 1.5; | ||
| 304 | + color: #fff; | ||
| 305 | + background: rgba(255, 255, 255, 0.18); | ||
| 306 | + border: 1px solid rgba(255, 255, 255, 0.35); | ||
| 307 | + border-radius: 999px; | ||
| 308 | +} | ||
| 237 | 309 | ||
| 238 | - &__title { | ||
| 239 | - margin: 0 0 8px; | ||
| 240 | - font-size: 24px; | ||
| 241 | - font-weight: 600; | ||
| 242 | - line-height: 1.3; | ||
| 243 | - } | 310 | +.dashboard-hero__title { |
| 311 | + margin: 0 0 10px; | ||
| 312 | + font-size: 26px; | ||
| 313 | + font-weight: 700; | ||
| 314 | + line-height: 1.3; | ||
| 315 | + letter-spacing: 0.02em; | ||
| 316 | +} | ||
| 244 | 317 | ||
| 245 | - &__subtitle { | ||
| 246 | - margin: 0; | ||
| 247 | - font-size: 13px; | ||
| 248 | - opacity: 0.88; | ||
| 249 | - line-height: 1.5; | ||
| 250 | - } | 318 | +.dashboard-hero__subtitle { |
| 319 | + display: flex; | ||
| 320 | + flex-wrap: wrap; | ||
| 321 | + align-items: center; | ||
| 322 | + gap: 6px; | ||
| 323 | + margin: 0; | ||
| 324 | + font-size: 13px; | ||
| 325 | + line-height: 1.5; | ||
| 326 | + color: rgba(255, 255, 255, 0.82); | ||
| 327 | + | ||
| 328 | + .el-icon-date { | ||
| 329 | + font-size: 14px; | ||
| 330 | + opacity: 0.9; | ||
| 251 | } | 331 | } |
| 332 | +} | ||
| 252 | 333 | ||
| 253 | - .dashboard-login-info { | ||
| 254 | - background: #fff; | ||
| 255 | - border-radius: 12px; | ||
| 256 | - padding: 18px 20px; | ||
| 257 | - box-shadow: 0 2px 12px rgba(0, 0, 0, 0.06); | ||
| 258 | - border-left: 4px solid #409eff; | ||
| 259 | - | ||
| 260 | - &__head { | ||
| 261 | - display: flex; | ||
| 262 | - align-items: center; | ||
| 263 | - gap: 8px; | ||
| 264 | - font-size: 15px; | ||
| 265 | - font-weight: 600; | ||
| 266 | - color: #303133; | ||
| 267 | - margin-bottom: 12px; | ||
| 268 | - } | 334 | +.dashboard-hero__subtitle-sep { |
| 335 | + opacity: 0.6; | ||
| 336 | +} | ||
| 269 | 337 | ||
| 270 | - &__grid { | ||
| 271 | - display: grid; | ||
| 272 | - grid-template-columns: repeat(2, minmax(0, 1fr)); | ||
| 273 | - gap: 10px 20px; | ||
| 274 | - } | 338 | +.dashboard-login-info { |
| 339 | + background: #fff; | ||
| 340 | + border-radius: $card-radius; | ||
| 341 | + padding: 20px 22px 22px; | ||
| 342 | + box-shadow: 0 2px 16px rgba(0, 0, 0, 0.06); | ||
| 343 | + border: 1px solid #ebeef5; | ||
| 344 | + border-top: 3px solid $color-primary; | ||
| 345 | +} | ||
| 275 | 346 | ||
| 276 | - &__item { | ||
| 277 | - display: flex; | ||
| 278 | - align-items: center; | ||
| 279 | - min-height: 34px; | ||
| 280 | - border-radius: 8px; | ||
| 281 | - background: #f8faff; | ||
| 282 | - padding: 0 12px; | ||
| 283 | - } | 347 | +.dashboard-login-info__head { |
| 348 | + display: flex; | ||
| 349 | + align-items: center; | ||
| 350 | + gap: 10px; | ||
| 351 | + margin-bottom: 16px; | ||
| 352 | +} | ||
| 284 | 353 | ||
| 285 | - &__label { | ||
| 286 | - flex: 0 0 72px; | ||
| 287 | - font-size: 13px; | ||
| 288 | - color: #909399; | ||
| 289 | - } | 354 | +.dashboard-login-info__head-icon { |
| 355 | + display: flex; | ||
| 356 | + align-items: center; | ||
| 357 | + justify-content: center; | ||
| 358 | + width: 32px; | ||
| 359 | + height: 32px; | ||
| 360 | + border-radius: 8px; | ||
| 361 | + background: rgba($color-primary, 0.08); | ||
| 362 | + color: $color-primary; | ||
| 363 | + font-size: 16px; | ||
| 364 | +} | ||
| 290 | 365 | ||
| 291 | - &__value { | ||
| 292 | - font-size: 13px; | ||
| 293 | - color: #303133; | ||
| 294 | - font-weight: 500; | ||
| 295 | - overflow: hidden; | ||
| 296 | - text-overflow: ellipsis; | ||
| 297 | - white-space: nowrap; | ||
| 298 | - } | ||
| 299 | - } | 366 | +.dashboard-login-info__head-title { |
| 367 | + font-size: 15px; | ||
| 368 | + font-weight: 600; | ||
| 369 | + color: $text-dark; | ||
| 370 | +} | ||
| 300 | 371 | ||
| 301 | - >>> .layout-area { | ||
| 302 | - width: 100%; | ||
| 303 | - border-radius: 4px; | ||
| 304 | - overflow: hidden; | 372 | +.dashboard-login-info__grid { |
| 373 | + display: grid; | ||
| 374 | + grid-template-columns: repeat(2, minmax(0, 1fr)); | ||
| 375 | + gap: 12px; | ||
| 376 | + margin: 0; | ||
| 377 | + padding: 0; | ||
| 378 | + list-style: none; | ||
| 379 | +} | ||
| 380 | + | ||
| 381 | +.dashboard-login-info__item { | ||
| 382 | + display: flex; | ||
| 383 | + align-items: center; | ||
| 384 | + gap: 12px; | ||
| 385 | + min-height: 72px; | ||
| 386 | + padding: 12px 14px; | ||
| 387 | + border-radius: 10px; | ||
| 388 | + background: #fafbfc; | ||
| 389 | + border: 1px solid #f0f2f5; | ||
| 390 | + transition: border-color 0.2s ease, box-shadow 0.2s ease; | ||
| 391 | +} | ||
| 392 | + | ||
| 393 | +.dashboard-login-info__item:hover { | ||
| 394 | + border-color: rgba($color-primary, 0.2); | ||
| 395 | + box-shadow: 0 2px 8px rgba($color-primary, 0.06); | ||
| 396 | +} | ||
| 397 | + | ||
| 398 | +.dashboard-login-info__icon { | ||
| 399 | + display: flex; | ||
| 400 | + align-items: center; | ||
| 401 | + justify-content: center; | ||
| 402 | + flex-shrink: 0; | ||
| 403 | + width: 40px; | ||
| 404 | + height: 40px; | ||
| 405 | + border-radius: 10px; | ||
| 406 | + font-size: 18px; | ||
| 407 | + | ||
| 408 | + &--account { | ||
| 409 | + background: rgba($color-primary, 0.1); | ||
| 410 | + color: $color-primary; | ||
| 305 | } | 411 | } |
| 306 | 412 | ||
| 307 | - .setting-btn { | ||
| 308 | - position: absolute; | ||
| 309 | - top: 200px; | ||
| 310 | - right: -10px; | ||
| 311 | - height: 40px; | ||
| 312 | - width: 40px; | ||
| 313 | - text-align: center; | ||
| 314 | - padding: 0; | ||
| 315 | - border-radius: 20px 0 0 20px; | ||
| 316 | - z-index: 100; | ||
| 317 | - | ||
| 318 | - >>> i { | ||
| 319 | - font-size: 20px; | ||
| 320 | - font-weight: 580; | ||
| 321 | - } | 413 | + &--name { |
| 414 | + background: rgba(64, 158, 255, 0.1); | ||
| 415 | + color: #409eff; | ||
| 322 | } | 416 | } |
| 323 | 417 | ||
| 324 | - >>> .vue-grid-layout { | ||
| 325 | - margin: -10px; | 418 | + &--time { |
| 419 | + background: rgba(103, 194, 58, 0.12); | ||
| 420 | + color: #67c23a; | ||
| 326 | } | 421 | } |
| 327 | 422 | ||
| 328 | - >>> .el-scrollbar__view { | ||
| 329 | - overflow: hidden; | 423 | + &--env { |
| 424 | + background: rgba(144, 147, 153, 0.12); | ||
| 425 | + color: #606266; | ||
| 330 | } | 426 | } |
| 331 | } | 427 | } |
| 428 | + | ||
| 429 | +.dashboard-login-info__meta { | ||
| 430 | + min-width: 0; | ||
| 431 | + flex: 1; | ||
| 432 | + display: flex; | ||
| 433 | + flex-direction: column; | ||
| 434 | + gap: 4px; | ||
| 435 | +} | ||
| 436 | + | ||
| 437 | +.dashboard-login-info__label { | ||
| 438 | + font-size: 12px; | ||
| 439 | + color: $text-muted; | ||
| 440 | + line-height: 1.3; | ||
| 441 | +} | ||
| 442 | + | ||
| 443 | +.dashboard-login-info__value { | ||
| 444 | + font-size: 14px; | ||
| 445 | + font-weight: 600; | ||
| 446 | + color: $text-dark; | ||
| 447 | + line-height: 1.4; | ||
| 448 | + overflow: hidden; | ||
| 449 | + text-overflow: ellipsis; | ||
| 450 | + white-space: nowrap; | ||
| 451 | +} | ||
| 452 | + | ||
| 332 | @media (max-width: 768px) { | 453 | @media (max-width: 768px) { |
| 333 | - .dashboard-container { | ||
| 334 | - .dashboard-body { | ||
| 335 | - padding: 14px 12px 24px; | ||
| 336 | - } | 454 | + .dashboard-body { |
| 455 | + padding: 16px 14px 28px; | ||
| 456 | + } | ||
| 337 | 457 | ||
| 338 | - .dashboard-hero { | ||
| 339 | - padding: 18px 16px; | 458 | + .dashboard-hero { |
| 459 | + padding: 20px 18px; | ||
| 460 | + } | ||
| 340 | 461 | ||
| 341 | - &__content { | ||
| 342 | - align-items: flex-start; | ||
| 343 | - gap: 12px; | ||
| 344 | - } | 462 | + .dashboard-hero__content { |
| 463 | + flex-direction: column; | ||
| 464 | + align-items: flex-start; | ||
| 465 | + gap: 16px; | ||
| 466 | + } | ||
| 345 | 467 | ||
| 346 | - &__avatar { | ||
| 347 | - width: 52px; | ||
| 348 | - height: 52px; | ||
| 349 | - font-size: 24px; | ||
| 350 | - } | 468 | + .dashboard-hero__logo { |
| 469 | + width: 72px; | ||
| 470 | + height: 72px; | ||
| 471 | + } | ||
| 351 | 472 | ||
| 352 | - &__title { | ||
| 353 | - font-size: 20px; | ||
| 354 | - } | ||
| 355 | - } | 473 | + .dashboard-hero__title { |
| 474 | + font-size: 22px; | ||
| 475 | + } | ||
| 356 | 476 | ||
| 357 | - .dashboard-login-info { | ||
| 358 | - padding: 14px; | 477 | + .dashboard-login-info { |
| 478 | + padding: 16px; | ||
| 479 | + } | ||
| 359 | 480 | ||
| 360 | - &__grid { | ||
| 361 | - grid-template-columns: 1fr; | ||
| 362 | - } | ||
| 363 | - } | 481 | + .dashboard-login-info__grid { |
| 482 | + grid-template-columns: 1fr; | ||
| 483 | + } | ||
| 484 | + | ||
| 485 | + .dashboard-login-info__item { | ||
| 486 | + min-height: 64px; | ||
| 487 | + } | ||
| 488 | +} | ||
| 489 | + | ||
| 490 | +@media (prefers-reduced-motion: reduce) { | ||
| 491 | + .dashboard-login-info__item { | ||
| 492 | + transition: none; | ||
| 364 | } | 493 | } |
| 365 | } | 494 | } |
| 366 | </style> | 495 | </style> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/dynamicDictionary/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog :title="!dataForm.id ? '新建字典' : '编辑字典'" :close-on-click-modal="false" | 2 | <el-dialog :title="!dataForm.id ? '新建字典' : '编辑字典'" :close-on-click-modal="false" |
| 3 | :close-on-press-escape="false" :visible.sync="visible" lock-scroll width="600px" | 3 | :close-on-press-escape="false" :visible.sync="visible" lock-scroll width="600px" |
| 4 | - class="NCC-dialog NCC-dialog_center"> | 4 | + class="NCC-dialog NCC-dialog_center" append-to-body modal-append-to-body> |
| 5 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" v-loading="formLoading" | 5 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" v-loading="formLoading" |
| 6 | label-width="80px"> | 6 | label-width="80px"> |
| 7 | <el-form-item label="项目上级" prop="parentId"> | 7 | <el-form-item label="项目上级" prop="parentId"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/dynamicModel/list/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center NCC-dialog-export" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center NCC-dialog-export" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top"> | 4 | <el-form label-position="top"> |
| 5 | <el-form-item> | 5 | <el-form-item> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/dynamicModel/list/Form.vue
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <template v-if="formConf.popupType==='general'"> | 3 | <template v-if="formConf.popupType==='general'"> |
| 4 | <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" | 4 | <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" |
| 5 | :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll | 5 | :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll |
| 6 | - :width="formConf.generalWidth"> | 6 | + :width="formConf.generalWidth" append-to-body modal-append-to-body> |
| 7 | <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" | 7 | <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" |
| 8 | :setFormData="setFormData" :setShowOrHide="setShowOrHide" :setRequired="setRequired" | 8 | :setFormData="setFormData" :setShowOrHide="setShowOrHide" :setRequired="setRequired" |
| 9 | :setDisabled="setDisabled" :setFieldOptions="setFieldOptions" v-if="!loading" /> | 9 | :setDisabled="setDisabled" :setFieldOptions="setFieldOptions" v-if="!loading" /> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/dynamicModel/list/ImportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导入数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导入数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-row> | 4 | <el-row> |
| 5 | <el-col :span="12" class="grid-content"> | 5 | <el-col :span="12" class="grid-content"> |
| 6 | <p>下载导入模板,填写数据</p> | 6 | <p>下载导入模板,填写数据</p> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/messageRecord/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="查看消息" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="查看消息" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="80%"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="80%" append-to-body modal-append-to-body> |
| 4 | <div class="notice-wapper" v-loading="loading"> | 4 | <div class="notice-wapper" v-loading="loading"> |
| 5 | <h1 class="title">{{info.title}}</h1> | 5 | <h1 class="title">{{info.title}}</h1> |
| 6 | <div class="info"> | 6 | <div class="info"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/basic/todoCenter/index.vue
| @@ -142,6 +142,19 @@ | @@ -142,6 +142,19 @@ | ||
| 142 | </template> | 142 | </template> |
| 143 | </el-table-column> | 143 | </el-table-column> |
| 144 | <el-table-column | 144 | <el-table-column |
| 145 | + label="订单号/运单号" | ||
| 146 | + min-width="168" | ||
| 147 | + class-name="todo-yd-dd-col" | ||
| 148 | + show-overflow-tooltip | ||
| 149 | + > | ||
| 150 | + <template slot-scope="scope"> | ||
| 151 | + <div class="todo-yd-dd-cell"> | ||
| 152 | + <div class="cell-nowrap">订单号:{{ cellText(scope.row.dyddh) }}</div> | ||
| 153 | + <div class="cell-nowrap todo-yd-dd-cell__sub">运单号:{{ cellText(scope.row.yddh) }}</div> | ||
| 154 | + </div> | ||
| 155 | + </template> | ||
| 156 | + </el-table-column> | ||
| 157 | + <el-table-column | ||
| 145 | label="单据类型" | 158 | label="单据类型" |
| 146 | width="160" | 159 | width="160" |
| 147 | show-overflow-tooltip | 160 | show-overflow-tooltip |
| @@ -463,13 +476,33 @@ | @@ -463,13 +476,33 @@ | ||
| 463 | </WtBydDetailView> | 476 | </WtBydDetailView> |
| 464 | 477 | ||
| 465 | <WtFpsqDetailView | 478 | <WtFpsqDetailView |
| 466 | - v-if="processVisible && processBillType === '发票申请'" | 479 | + v-if="processVisible && isFpsqProcessBillType" |
| 467 | ref="processDlg" | 480 | ref="processDlg" |
| 468 | @close="onProcessDialogClose" | 481 | @close="onProcessDialogClose" |
| 469 | @loaded="onProcessLoaded" | 482 | @loaded="onProcessLoaded" |
| 470 | > | 483 | > |
| 471 | <template slot="footer"> | 484 | <template slot="footer"> |
| 485 | + <div v-if="isFpsqConfirmTodoProcess" class="dialog-footer todo-audit-footer dialog-footer--left"> | ||
| 486 | + <el-button @click="closeProcessDialog">关闭</el-button> | ||
| 487 | + <el-button | ||
| 488 | + type="primary" | ||
| 489 | + :loading="fpsqConfirmDoneSubmitting" | ||
| 490 | + :disabled="fpsqConfirmDoneSubmitting" | ||
| 491 | + @click="handleFpsqConfirmDone" | ||
| 492 | + >确认完结</el-button> | ||
| 493 | + </div> | ||
| 494 | + <TodoAuditFooter | ||
| 495 | + v-else-if="isFpsqFinanceTodoProcess" | ||
| 496 | + :can-level1="canFpsqFinanceTodoAction" | ||
| 497 | + :can-level2="false" | ||
| 498 | + :can-reject="canFpsqFinanceTodoAction" | ||
| 499 | + level1-text="确认开出" | ||
| 500 | + @close="closeProcessDialog" | ||
| 501 | + @level1="openFpsqConfirmIssuedFromTodo" | ||
| 502 | + @reject="handleReject" | ||
| 503 | + /> | ||
| 472 | <TodoAuditFooter | 504 | <TodoAuditFooter |
| 505 | + v-else | ||
| 473 | :can-level1="canLevel1Approve" | 506 | :can-level1="canLevel1Approve" |
| 474 | :can-level2="canLevel2Approve" | 507 | :can-level2="canLevel2Approve" |
| 475 | :can-reject="canAuditReject" | 508 | :can-reject="canAuditReject" |
| @@ -693,6 +726,24 @@ | @@ -693,6 +726,24 @@ | ||
| 693 | </template> | 726 | </template> |
| 694 | </WtCzdDetailView> | 727 | </WtCzdDetailView> |
| 695 | 728 | ||
| 729 | + <WtMdzcdDetailView | ||
| 730 | + v-if="processVisible && processBillType === '门店支出单'" | ||
| 731 | + ref="processDlg" | ||
| 732 | + @close="onProcessDialogClose" | ||
| 733 | + @loaded="onProcessLoaded" | ||
| 734 | + > | ||
| 735 | + <template slot="footer"> | ||
| 736 | + <TodoAuditFooter | ||
| 737 | + single-level | ||
| 738 | + :can-level1="canLevel1Approve" | ||
| 739 | + :can-reject="canAuditReject" | ||
| 740 | + @close="closeProcessDialog" | ||
| 741 | + @level1="handleLevel1Approve" | ||
| 742 | + @reject="handleReject" | ||
| 743 | + /> | ||
| 744 | + </template> | ||
| 745 | + </WtMdzcdDetailView> | ||
| 746 | + | ||
| 696 | <WtCwdjSkdDetailView | 747 | <WtCwdjSkdDetailView |
| 697 | v-if="processVisible && processBillType === '收款单'" | 748 | v-if="processVisible && processBillType === '收款单'" |
| 698 | ref="processDlg" | 749 | ref="processDlg" |
| @@ -880,6 +931,8 @@ | @@ -880,6 +931,8 @@ | ||
| 880 | :z-index="rejectDialogZIndex" | 931 | :z-index="rejectDialogZIndex" |
| 881 | @confirm="onRejectDialogConfirm" | 932 | @confirm="onRejectDialogConfirm" |
| 882 | /> | 933 | /> |
| 934 | + | ||
| 935 | + <confirm-issued-dialog ref="fpsqConfirmIssuedDialog" @success="onFpsqConfirmIssuedSuccess" /> | ||
| 883 | </div> | 936 | </div> |
| 884 | </template> | 937 | </template> |
| 885 | 938 | ||
| @@ -906,6 +959,9 @@ import WtCwdjGdzcgmDetailView from "@/views/wtCwdj_gdzcgm/detail-view.vue"; | @@ -906,6 +959,9 @@ import WtCwdjGdzcgmDetailView from "@/views/wtCwdj_gdzcgm/detail-view.vue"; | ||
| 906 | import WtCwdjGdzczjDetailView from "@/views/wtCwdj_gdzczj/detail-view.vue"; | 959 | import WtCwdjGdzczjDetailView from "@/views/wtCwdj_gdzczj/detail-view.vue"; |
| 907 | import WtCwdjGdzcbmDetailView from "@/views/wtCwdj_gdzcbm/detail-view.vue"; | 960 | import WtCwdjGdzcbmDetailView from "@/views/wtCwdj_gdzcbm/detail-view.vue"; |
| 908 | import WtFpsqDetailView from "@/views/wtFpsq/detail-view.vue"; | 961 | import WtFpsqDetailView from "@/views/wtFpsq/detail-view.vue"; |
| 962 | +import ConfirmIssuedDialog from "@/views/wtFpsq/confirm-issued-dialog.vue"; | ||
| 963 | +import { postFpsqConfirmDone } from "@/utils/wtFpsqApi"; | ||
| 964 | +import { isFpsqPendingFinance } from "@/utils/wtFpsqDjztDisplay"; | ||
| 909 | import WtPriceAdjustDetailView from "@/views/wtPriceAdjust/detail-view.vue"; | 965 | import WtPriceAdjustDetailView from "@/views/wtPriceAdjust/detail-view.vue"; |
| 910 | import WtXswtdxfhdDetailView from "@/views/wtXswtdxfhd/detail-view.vue"; | 966 | import WtXswtdxfhdDetailView from "@/views/wtXswtdxfhd/detail-view.vue"; |
| 911 | import WtXswtdxthdDetailView from "@/views/wtXswtdxthd/detail-view.vue"; | 967 | import WtXswtdxthdDetailView from "@/views/wtXswtdxthd/detail-view.vue"; |
| @@ -917,6 +973,7 @@ import WtYskzjjsXjDetailView from "@/views/wtYskzjjs_xj/detail-view.vue"; | @@ -917,6 +973,7 @@ import WtYskzjjsXjDetailView from "@/views/wtYskzjjs_xj/detail-view.vue"; | ||
| 917 | import WtYskzjjsApArDetailView from "@/views/wtYskzjjs/wt-yskzjjs-ap-ar-detail-view.vue"; | 973 | import WtYskzjjsApArDetailView from "@/views/wtYskzjjs/wt-yskzjjs-ap-ar-detail-view.vue"; |
| 918 | import WtFysrdQtsrDetailView from "@/views/wtFysrd_qtsr/detail-view.vue"; | 974 | import WtFysrdQtsrDetailView from "@/views/wtFysrd_qtsr/detail-view.vue"; |
| 919 | import WtCzdDetailView from "@/views/wtCzd/detail-view.vue"; | 975 | import WtCzdDetailView from "@/views/wtCzd/detail-view.vue"; |
| 976 | +import WtMdzcdDetailView from "@/views/wtMdzcd/detail-view.vue"; | ||
| 920 | import WtHzdDetailView from "@/views/wtHzd/detail-view.vue"; | 977 | import WtHzdDetailView from "@/views/wtHzd/detail-view.vue"; |
| 921 | import WtKfbfbDetailView from "@/views/wtKfbfb/detail-view.vue"; | 978 | import WtKfbfbDetailView from "@/views/wtKfbfb/detail-view.vue"; |
| 922 | import { | 979 | import { |
| @@ -928,6 +985,8 @@ import { | @@ -928,6 +985,8 @@ import { | ||
| 928 | postYskzjjsReject, | 985 | postYskzjjsReject, |
| 929 | postCzdApprove, | 986 | postCzdApprove, |
| 930 | postCzdReject, | 987 | postCzdReject, |
| 988 | + postMdzcdApprove, | ||
| 989 | + postMdzcdReject, | ||
| 931 | postCwdjReject, | 990 | postCwdjReject, |
| 932 | postKfbfbRejectGeneric | 991 | postKfbfbRejectGeneric |
| 933 | } from "@/utils/wtRejectApproval"; | 992 | } from "@/utils/wtRejectApproval"; |
| @@ -960,6 +1019,7 @@ const BILL_TYPES = [ | @@ -960,6 +1019,7 @@ const BILL_TYPES = [ | ||
| 960 | "应收款减少", | 1019 | "应收款减少", |
| 961 | "应收款增加", | 1020 | "应收款增加", |
| 962 | "现金费用单", | 1021 | "现金费用单", |
| 1022 | + "门店支出单", | ||
| 963 | "费用单", | 1023 | "费用单", |
| 964 | "待摊费用摊销", | 1024 | "待摊费用摊销", |
| 965 | "固定资产折旧", | 1025 | "固定资产折旧", |
| @@ -969,6 +1029,7 @@ const BILL_TYPES = [ | @@ -969,6 +1029,7 @@ const BILL_TYPES = [ | ||
| 969 | "付款单", | 1029 | "付款单", |
| 970 | "其他收入单", | 1030 | "其他收入单", |
| 971 | "商品调价单", | 1031 | "商品调价单", |
| 1032 | + "发票申请-待确认", | ||
| 972 | "发票申请", | 1033 | "发票申请", |
| 973 | "会员到期收款" | 1034 | "会员到期收款" |
| 974 | ]; | 1035 | ]; |
| @@ -1001,6 +1062,7 @@ export default { | @@ -1001,6 +1062,7 @@ export default { | ||
| 1001 | WtCwdjGdzczjDetailView, | 1062 | WtCwdjGdzczjDetailView, |
| 1002 | WtCwdjGdzcbmDetailView, | 1063 | WtCwdjGdzcbmDetailView, |
| 1003 | WtFpsqDetailView, | 1064 | WtFpsqDetailView, |
| 1065 | + ConfirmIssuedDialog, | ||
| 1004 | WtPriceAdjustDetailView, | 1066 | WtPriceAdjustDetailView, |
| 1005 | WtXswtdxfhdDetailView, | 1067 | WtXswtdxfhdDetailView, |
| 1006 | WtXswtdxthdDetailView, | 1068 | WtXswtdxthdDetailView, |
| @@ -1012,6 +1074,7 @@ export default { | @@ -1012,6 +1074,7 @@ export default { | ||
| 1012 | WtYskzjjsApArDetailView, | 1074 | WtYskzjjsApArDetailView, |
| 1013 | WtFysrdQtsrDetailView, | 1075 | WtFysrdQtsrDetailView, |
| 1014 | WtCzdDetailView, | 1076 | WtCzdDetailView, |
| 1077 | + WtMdzcdDetailView, | ||
| 1015 | WtHzdDetailView, | 1078 | WtHzdDetailView, |
| 1016 | WtKfbfbDetailView | 1079 | WtKfbfbDetailView |
| 1017 | }, | 1080 | }, |
| @@ -1064,6 +1127,7 @@ export default { | @@ -1064,6 +1127,7 @@ export default { | ||
| 1064 | /** 详情底栏审核提交中(provide 给 TodoAuditFooter) */ | 1127 | /** 详情底栏审核提交中(provide 给 TodoAuditFooter) */ |
| 1065 | todoAuditSubmitState: { submitting: false }, | 1128 | todoAuditSubmitState: { submitting: false }, |
| 1066 | xsckdApproveSubmitting: false, | 1129 | xsckdApproveSubmitting: false, |
| 1130 | + fpsqConfirmDoneSubmitting: false, | ||
| 1067 | /** 后台静默刷新列表/统计,避免阻塞成功反馈 */ | 1131 | /** 后台静默刷新列表/统计,避免阻塞成功反馈 */ |
| 1068 | _bgRefreshTimer: null | 1132 | _bgRefreshTimer: null |
| 1069 | }; | 1133 | }; |
| @@ -1177,6 +1241,23 @@ export default { | @@ -1177,6 +1241,23 @@ export default { | ||
| 1177 | const today = new Date(); | 1241 | const today = new Date(); |
| 1178 | today.setHours(23, 59, 59, 999); | 1242 | today.setHours(23, 59, 59, 999); |
| 1179 | return t.getTime() <= today.getTime(); | 1243 | return t.getTime() <= today.getTime(); |
| 1244 | + }, | ||
| 1245 | + isFpsqProcessBillType() { | ||
| 1246 | + const t = this.processBillType; | ||
| 1247 | + return t === "发票申请" || t === "发票申请-待确认"; | ||
| 1248 | + }, | ||
| 1249 | + /** 财务待办:billType=发票申请,状态待财务开票/旧待审核 */ | ||
| 1250 | + isFpsqFinanceTodoProcess() { | ||
| 1251 | + if (this.processBillType !== "发票申请") return false; | ||
| 1252 | + return isFpsqPendingFinance(this.getAuditStatus(this.processDetail)); | ||
| 1253 | + }, | ||
| 1254 | + /** 申请人待确认:billType=发票申请-待确认 */ | ||
| 1255 | + isFpsqConfirmTodoProcess() { | ||
| 1256 | + return this.processBillType === "发票申请-待确认"; | ||
| 1257 | + }, | ||
| 1258 | + canFpsqFinanceTodoAction() { | ||
| 1259 | + if (!this.isFpsqFinanceTodoProcess) return false; | ||
| 1260 | + return this.isCurrentUserInAuditLevel("发票申请", 1); | ||
| 1180 | } | 1261 | } |
| 1181 | }, | 1262 | }, |
| 1182 | created() { | 1263 | created() { |
| @@ -1459,8 +1540,11 @@ export default { | @@ -1459,8 +1540,11 @@ export default { | ||
| 1459 | const s = String(status || "").trim(); | 1540 | const s = String(status || "").trim(); |
| 1460 | if (!s) return true; | 1541 | if (!s) return true; |
| 1461 | if (s === "已审核" || s === "审核不通过" || s === "草稿") return false; | 1542 | if (s === "已审核" || s === "审核不通过" || s === "草稿") return false; |
| 1543 | + if (s === "已完结" || s === "已驳回") return false; | ||
| 1462 | return ( | 1544 | return ( |
| 1463 | s === "待审核" || | 1545 | s === "待审核" || |
| 1546 | + s === "待财务开票" || | ||
| 1547 | + s === "已开票待确认" || | ||
| 1464 | s === "待一级" || | 1548 | s === "待一级" || |
| 1465 | s === "一级已审" || | 1549 | s === "一级已审" || |
| 1466 | s === "待二级" || | 1550 | s === "待二级" || |
| @@ -1688,6 +1772,12 @@ export default { | @@ -1688,6 +1772,12 @@ export default { | ||
| 1688 | if (t === "拆装单") { | 1772 | if (t === "拆装单") { |
| 1689 | return { msg: "确认执行一级审核该拆装单?", title: "审核确认" }; | 1773 | return { msg: "确认执行一级审核该拆装单?", title: "审核确认" }; |
| 1690 | } | 1774 | } |
| 1775 | + if (t === "门店支出单") { | ||
| 1776 | + return { | ||
| 1777 | + msg: "确认审核该门店支出单?通过后将从所选付款账户扣减发生额。", | ||
| 1778 | + title: "审核确认" | ||
| 1779 | + }; | ||
| 1780 | + } | ||
| 1691 | if (t === "同价调拨单") { | 1781 | if (t === "同价调拨单") { |
| 1692 | return { | 1782 | return { |
| 1693 | msg: "确认执行一级审核(调出仓确认发货)?须填写物流运单号。", | 1783 | msg: "确认执行一级审核(调出仓确认发货)?须填写物流运单号。", |
| @@ -1979,6 +2069,10 @@ export default { | @@ -1979,6 +2069,10 @@ export default { | ||
| 1979 | handleLevel1Approve() { | 2069 | handleLevel1Approve() { |
| 1980 | const id = this.processBillId; | 2070 | const id = this.processBillId; |
| 1981 | if (!id) return; | 2071 | if (!id) return; |
| 2072 | + if (this.processBillType === "发票申请") { | ||
| 2073 | + this.openFpsqConfirmIssuedFromTodo(); | ||
| 2074 | + return; | ||
| 2075 | + } | ||
| 1982 | if (this.processBillType === "销售出库单" || this.processBillType === "同价调拨单") { | 2076 | if (this.processBillType === "销售出库单" || this.processBillType === "同价调拨单") { |
| 1983 | this.openXsckdApproveDialogForTodo("level1"); | 2077 | this.openXsckdApproveDialogForTodo("level1"); |
| 1984 | return; | 2078 | return; |
| @@ -2098,6 +2192,11 @@ export default { | @@ -2098,6 +2192,11 @@ export default { | ||
| 2098 | postCzdApprove(id, remark) | 2192 | postCzdApprove(id, remark) |
| 2099 | ); | 2193 | ); |
| 2100 | } | 2194 | } |
| 2195 | + if (this.processBillType === "门店支出单") { | ||
| 2196 | + return promptApprovalRemark(this, "审批备注").then(remark => | ||
| 2197 | + postMdzcdApprove(id, remark) | ||
| 2198 | + ); | ||
| 2199 | + } | ||
| 2101 | return promptApprovalRemark(this, "审批备注").then(remark => { | 2200 | return promptApprovalRemark(this, "审批备注").then(remark => { |
| 2102 | if (this.processBillType === "客服补发单") { | 2201 | if (this.processBillType === "客服补发单") { |
| 2103 | return request({ | 2202 | return request({ |
| @@ -2186,6 +2285,9 @@ export default { | @@ -2186,6 +2285,9 @@ export default { | ||
| 2186 | if (t === "拆装单") { | 2285 | if (t === "拆装单") { |
| 2187 | return postCzdReject(id, reason); | 2286 | return postCzdReject(id, reason); |
| 2188 | } | 2287 | } |
| 2288 | + if (t === "门店支出单") { | ||
| 2289 | + return postMdzcdReject(id, reason); | ||
| 2290 | + } | ||
| 2189 | if (t === "客服补发单") { | 2291 | if (t === "客服补发单") { |
| 2190 | return postKfbfbRejectGeneric(id, reason); | 2292 | return postKfbfbRejectGeneric(id, reason); |
| 2191 | } | 2293 | } |
| @@ -2203,6 +2305,54 @@ export default { | @@ -2203,6 +2305,54 @@ export default { | ||
| 2203 | this.rejectDialogZIndex = getTopStackedOverlayZIndex() + 200; | 2305 | this.rejectDialogZIndex = getTopStackedOverlayZIndex() + 200; |
| 2204 | this.rejectDialogVisible = true; | 2306 | this.rejectDialogVisible = true; |
| 2205 | }, | 2307 | }, |
| 2308 | + openFpsqConfirmIssuedFromTodo() { | ||
| 2309 | + const id = this.processBillId; | ||
| 2310 | + if (!id) return; | ||
| 2311 | + const dlg = this.$refs.fpsqConfirmIssuedDialog; | ||
| 2312 | + if (dlg && typeof dlg.open === "function") dlg.open(id); | ||
| 2313 | + }, | ||
| 2314 | + onFpsqConfirmIssuedSuccess() { | ||
| 2315 | + const id = this.processBillId; | ||
| 2316 | + if (!id) return; | ||
| 2317 | + this.afterTodoAuditHandled(id, "已确认开出", { | ||
| 2318 | + auditAction: "level1", | ||
| 2319 | + removeImmediately: true | ||
| 2320 | + }); | ||
| 2321 | + if (this.$refs.processDlg && typeof this.$refs.processDlg.init === "function") { | ||
| 2322 | + this.$refs.processDlg.init(id); | ||
| 2323 | + } | ||
| 2324 | + }, | ||
| 2325 | + handleFpsqConfirmDone() { | ||
| 2326 | + const id = this.processBillId; | ||
| 2327 | + if (!id || this.fpsqConfirmDoneSubmitting) return; | ||
| 2328 | + this.$confirm("确认已收到发票并完结该申请?", "确认完结", { | ||
| 2329 | + type: "warning", | ||
| 2330 | + customClass: "todo-approval-msgbox" | ||
| 2331 | + }) | ||
| 2332 | + .then(() => { | ||
| 2333 | + this.fpsqConfirmDoneSubmitting = true; | ||
| 2334 | + return postFpsqConfirmDone(id); | ||
| 2335 | + }) | ||
| 2336 | + .then(res => { | ||
| 2337 | + const { success, message } = this.parseApproveResponse(res); | ||
| 2338 | + if (success) { | ||
| 2339 | + this.afterTodoAuditHandled(id, message || "已完结", { | ||
| 2340 | + auditAction: "level1", | ||
| 2341 | + removeImmediately: true | ||
| 2342 | + }); | ||
| 2343 | + } else { | ||
| 2344 | + this.showAuditError(message, "操作失败"); | ||
| 2345 | + } | ||
| 2346 | + }) | ||
| 2347 | + .catch(err => { | ||
| 2348 | + if (err !== "cancel" && err !== "close") { | ||
| 2349 | + this.showAuditError(err, "操作失败"); | ||
| 2350 | + } | ||
| 2351 | + }) | ||
| 2352 | + .finally(() => { | ||
| 2353 | + this.fpsqConfirmDoneSubmitting = false; | ||
| 2354 | + }); | ||
| 2355 | + }, | ||
| 2206 | onRejectDialogConfirm(reason) { | 2356 | onRejectDialogConfirm(reason) { |
| 2207 | const id = this.processBillId; | 2357 | const id = this.processBillId; |
| 2208 | if (!id) { | 2358 | if (!id) { |
| @@ -2259,6 +2409,20 @@ export default { | @@ -2259,6 +2409,20 @@ export default { | ||
| 2259 | .cell-nowrap { | 2409 | .cell-nowrap { |
| 2260 | white-space: nowrap; | 2410 | white-space: nowrap; |
| 2261 | } | 2411 | } |
| 2412 | + .todo-yd-dd-cell { | ||
| 2413 | + display: flex; | ||
| 2414 | + flex-direction: column; | ||
| 2415 | + gap: 2px; | ||
| 2416 | + line-height: 1.35; | ||
| 2417 | + font-size: 13px; | ||
| 2418 | + } | ||
| 2419 | + .todo-yd-dd-cell__sub { | ||
| 2420 | + color: #909399; | ||
| 2421 | + font-size: 12px; | ||
| 2422 | + } | ||
| 2423 | + ::v-deep .todo-yd-dd-col .cell { | ||
| 2424 | + white-space: normal; | ||
| 2425 | + } | ||
| 2262 | /* 摘要:信息密度较高,预留足够展示空间;溢出由 el-table 的 show-overflow-tooltip 处理 */ | 2426 | /* 摘要:信息密度较高,预留足够展示空间;溢出由 el-table 的 show-overflow-tooltip 处理 */ |
| 2263 | .cell-zy { | 2427 | .cell-zy { |
| 2264 | display: inline-block; | 2428 | display: inline-block; |
Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/CreateWaybill.vue
| @@ -671,7 +671,7 @@ | @@ -671,7 +671,7 @@ | ||
| 671 | <SerialNumberSelect ref="serialNumberSelectRef" @confirm="handleSerialNumberSelect" /> | 671 | <SerialNumberSelect ref="serialNumberSelectRef" @confirm="handleSerialNumberSelect" /> |
| 672 | 672 | ||
| 673 | <!-- 商品选择对话框:打开时自动加载商品列表(无关键词时显示全部) --> | 673 | <!-- 商品选择对话框:打开时自动加载商品列表(无关键词时显示全部) --> |
| 674 | - <el-dialog :visible.sync="showProductDialog" title="选择ERP商品" width="980px" :close-on-click-modal="false" @opened="onProductDialogOpened"> | 674 | + <el-dialog :visible.sync="showProductDialog" title="选择ERP商品" width="980px" :close-on-click-modal="false" @opened="onProductDialogOpened" append-to-body modal-append-to-body> |
| 675 | <el-form :inline="true" size="small" style="margin-bottom: 12px;"> | 675 | <el-form :inline="true" size="small" style="margin-bottom: 12px;"> |
| 676 | <el-form-item label="商品品类"> | 676 | <el-form-item label="商品品类"> |
| 677 | <el-select | 677 | <el-select |
Antis.Erp.Plat/antis-ncc-admin/src/views/douyinLogistics/OrderList.vue
| @@ -715,6 +715,9 @@ | @@ -715,6 +715,9 @@ | ||
| 715 | 715 | ||
| 716 | <!-- 分页 --> | 716 | <!-- 分页 --> |
| 717 | <div class="pagination-bar"> | 717 | <div class="pagination-bar"> |
| 718 | + <span class="selection-hint" :class="{ 'is-active': selectedOrders.length > 0 }"> | ||
| 719 | + 已勾选 {{ selectedOrders.length }} 单 | ||
| 720 | + </span> | ||
| 718 | <el-pagination | 721 | <el-pagination |
| 719 | :current-page.sync="pagination.pageIndex" | 722 | :current-page.sync="pagination.pageIndex" |
| 720 | :page-size.sync="pagination.pageSize" | 723 | :page-size.sync="pagination.pageSize" |
| @@ -735,7 +738,7 @@ | @@ -735,7 +738,7 @@ | ||
| 735 | </el-card> | 738 | </el-card> |
| 736 | 739 | ||
| 737 | <!-- 其他物流发货对话框 --> | 740 | <!-- 其他物流发货对话框 --> |
| 738 | - <el-dialog :visible.sync="manualShipVisible" title="其他物流发货" width="480px" :close-on-click-modal="false"> | 741 | + <el-dialog :visible.sync="manualShipVisible" title="其他物流发货" width="480px" :close-on-click-modal="false" append-to-body modal-append-to-body> |
| 739 | <el-form :model="manualShipForm" label-width="100px" @submit.native.prevent> | 742 | <el-form :model="manualShipForm" label-width="100px" @submit.native.prevent> |
| 740 | <el-form-item label="订单号"> | 743 | <el-form-item label="订单号"> |
| 741 | <span>{{ manualShipForm.orderDisplay }}</span> | 744 | <span>{{ manualShipForm.orderDisplay }}</span> |
| @@ -755,7 +758,7 @@ | @@ -755,7 +758,7 @@ | ||
| 755 | </div> | 758 | </div> |
| 756 | </el-dialog> | 759 | </el-dialog> |
| 757 | 760 | ||
| 758 | - <el-dialog :visible.sync="remarkDialogVisible" title="备注回传抖音" width="560px" :close-on-click-modal="false"> | 761 | + <el-dialog :visible.sync="remarkDialogVisible" title="备注回传抖音" width="560px" :close-on-click-modal="false" append-to-body modal-append-to-body> |
| 759 | <el-form label-width="90px" @submit.native.prevent> | 762 | <el-form label-width="90px" @submit.native.prevent> |
| 760 | <el-form-item label="订单号"> | 763 | <el-form-item label="订单号"> |
| 761 | <span>{{ remarkForm.orderDisplay }}</span> | 764 | <span>{{ remarkForm.orderDisplay }}</span> |
| @@ -1364,20 +1367,15 @@ const displayPendingShipmentCount = computed(() => { | @@ -1364,20 +1367,15 @@ const displayPendingShipmentCount = computed(() => { | ||
| 1364 | }) | 1367 | }) |
| 1365 | 1368 | ||
| 1366 | /** | 1369 | /** |
| 1367 | - * 总订单 = 待提交运单 + 待提交发货单(随「显示全部」动态)+ 异常单 | 1370 | + * 总订单 = 当前筛选条件下合并后的全部订单(含已出库、待处理、异常),与列表「匹配 N 单」同口径。 |
| 1368 | */ | 1371 | */ |
| 1369 | const displayTotalCount = computed(() => { | 1372 | const displayTotalCount = computed(() => { |
| 1370 | - const wb = Number(stats.value.pendingWaybill) || 0 | ||
| 1371 | - const ps = Number(displayPendingShipmentCount.value) || 0 | ||
| 1372 | - const ab = Number(stats.value.abnormal) || 0 | ||
| 1373 | - return wb + ps + ab | 1373 | + if (stats.value.total === null) return null |
| 1374 | + return Number(stats.value.total) || 0 | ||
| 1374 | }) | 1375 | }) |
| 1375 | 1376 | ||
| 1376 | const displayTotalSubText = computed(() => { | 1377 | const displayTotalSubText = computed(() => { |
| 1377 | - if (pendingShipmentShowAll.value) { | ||
| 1378 | - return '待提交运单+待提交发货单(全部)+异常单' | ||
| 1379 | - } | ||
| 1380 | - return '待提交运单+待提交发货单(本系统)+异常单' | 1378 | + return '当前筛选全部订单(含已出库)' |
| 1381 | }) | 1379 | }) |
| 1382 | 1380 | ||
| 1383 | /** 商家实际收入(元):部分退款时按可发货商品占比折算 */ | 1381 | /** 商家实际收入(元):部分退款时按可发货商品占比折算 */ |
| @@ -3988,11 +3986,24 @@ onUnmounted(() => { | @@ -3988,11 +3986,24 @@ onUnmounted(() => { | ||
| 3988 | padding-top: 16px; | 3986 | padding-top: 16px; |
| 3989 | border-top: 1px solid #ebeef5; | 3987 | border-top: 1px solid #ebeef5; |
| 3990 | display: flex; | 3988 | display: flex; |
| 3991 | - justify-content: flex-end; | 3989 | + justify-content: space-between; |
| 3990 | + align-items: center; | ||
| 3992 | flex-wrap: wrap; | 3991 | flex-wrap: wrap; |
| 3993 | gap: 8px; | 3992 | gap: 8px; |
| 3994 | } | 3993 | } |
| 3995 | 3994 | ||
| 3995 | +.selection-hint { | ||
| 3996 | + font-size: 13px; | ||
| 3997 | + color: #909399; | ||
| 3998 | + line-height: 28px; | ||
| 3999 | + white-space: nowrap; | ||
| 4000 | +} | ||
| 4001 | + | ||
| 4002 | +.selection-hint.is-active { | ||
| 4003 | + color: #409EFF; | ||
| 4004 | + font-weight: 600; | ||
| 4005 | +} | ||
| 4006 | + | ||
| 3996 | .order-list-container ::v-deep .el-table { | 4007 | .order-list-container ::v-deep .el-table { |
| 3997 | min-width: 100%; | 4008 | min-width: 100%; |
| 3998 | table-layout: auto; | 4009 | table-layout: auto; |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/diagreports/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/diagreports/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/document/FolderTree.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="移动到" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="移动到" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center NCC-dialog-tree" lock-scroll width='450px'> | 3 | + class="NCC-dialog NCC-dialog_center NCC-dialog-tree" lock-scroll width='450px' append-to-body modal-append-to-body> |
| 4 | <el-tree :data="treeData" :props="defaultProps" default-expand-all highlight-current | 4 | <el-tree :data="treeData" :props="defaultProps" default-expand-all highlight-current |
| 5 | ref="treeBox" :expand-on-click-node="false" @node-click="handleNodeClick" | 5 | ref="treeBox" :expand-on-click-node="false" @node-click="handleNodeClick" |
| 6 | class="NCC-common-el-tree" node-key="id"> | 6 | class="NCC-common-el-tree" node-key="id"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/document/UserBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="共享文件" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="共享文件" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center transfer-dialog" lock-scroll width='800px'> | 3 | + class="NCC-dialog NCC-dialog_center transfer-dialog" lock-scroll width='800px' append-to-body modal-append-to-body> |
| 4 | <userTransfer v-model="checkedKeys" ref="userTransfer" multiple /> | 4 | <userTransfer v-model="checkedKeys" ref="userTransfer" multiple /> |
| 5 | <span slot="footer" class="dialog-footer"> | 5 | <span slot="footer" class="dialog-footer"> |
| 6 | <el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button> | 6 | <el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/email/Config.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="邮箱配置" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="邮箱配置" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> | 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> |
| 5 | <el-form-item label="POP3服务" prop="pop3Host"> | 5 | <el-form-item label="POP3服务" prop="pop3Host"> |
| 6 | <el-input v-model="dataForm.pop3Host" placeholder="POP3服务" /> | 6 | <el-input v-model="dataForm.pop3Host" placeholder="POP3服务" /> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/formDemo/fieldForm3/index.vue
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | :on-preview="handlePictureCardPreview" :on-remove="handleRemove" accept="image/*"> | 16 | :on-preview="handlePictureCardPreview" :on-remove="handleRemove" accept="image/*"> |
| 17 | <i class="el-icon-plus"></i> | 17 | <i class="el-icon-plus"></i> |
| 18 | </el-upload> | 18 | </el-upload> |
| 19 | - <el-dialog :visible.sync="dialogVisible"> | 19 | + <el-dialog :visible.sync="dialogVisible" append-to-body modal-append-to-body> |
| 20 | <img width="100%" :src="dialogImageUrl" alt=""> | 20 | <img width="100%" :src="dialogImageUrl" alt=""> |
| 21 | </el-dialog> | 21 | </el-dialog> |
| 22 | </el-form-item> | 22 | </el-form-item> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/importAndExport/ExportForm.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center NCC-dialog-export" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center NCC-dialog-export" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top"> | 4 | <el-form label-position="top"> |
| 5 | <el-form-item> | 5 | <el-form-item> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/importAndExport/ImportForm.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="批量导入" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="批量导入" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="1000px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="1000px" append-to-body modal-append-to-body> |
| 4 | <el-steps :active="active" align-center> | 4 | <el-steps :active="active" align-center> |
| 5 | <el-step title="上传文件"></el-step> | 5 | <el-step title="上传文件"></el-step> |
| 6 | <el-step title="数据预览"></el-step> | 6 | <el-step title="数据预览"></el-step> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/projectGantt/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | <el-dialog :title="!dataForm.id ? '新建项目' : '编辑项目'" :close-on-click-modal="false" | 3 | <el-dialog :title="!dataForm.id ? '新建项目' : '编辑项目'" :close-on-click-modal="false" |
| 4 | - :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 4 | + :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 5 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> | 5 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> |
| 6 | <el-form-item label="项目名称" prop="fullName" maxlength="50"> | 6 | <el-form-item label="项目名称" prop="fullName" maxlength="50"> |
| 7 | <el-input v-model="dataForm.fullName" placeholder="项目名称" /> | 7 | <el-input v-model="dataForm.fullName" placeholder="项目名称" /> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/schedule/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog :title="!dataForm.id ? '添加日程' : '编辑日程'" :close-on-click-modal="false" | 2 | <el-dialog :title="!dataForm.id ? '添加日程' : '编辑日程'" :close-on-click-modal="false" |
| 3 | - :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> | 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> |
| 5 | <el-form-item label="起始时间" prop="startTime"> | 5 | <el-form-item label="起始时间" prop="startTime"> |
| 6 | <el-date-picker v-model="dataForm.startTime" type="datetime" placeholder="选择日期时间" | 6 | <el-date-picker v-model="dataForm.startTime" type="datetime" placeholder="选择日期时间" |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/slices/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/slices/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/tableDemo/commonForm/index.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog :title="!dataForm.id ? '新建项目' : '编辑项目'" :close-on-click-modal="false" | 2 | <el-dialog :title="!dataForm.id ? '新建项目' : '编辑项目'" :close-on-click-modal="false" |
| 3 | - :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> | 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> |
| 5 | <el-form-item label="项目名称" prop="projectName"> | 5 | <el-form-item label="项目名称" prop="projectName"> |
| 6 | <el-input v-model="dataForm.projectName" placeholder="项目名称" /> | 6 | <el-input v-model="dataForm.projectName" placeholder="项目名称" /> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/tableDemo/complexHeader/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog :title="!dataForm.id ? '新建项目' : '编辑项目'" :close-on-click-modal="false" | 2 | <el-dialog :title="!dataForm.id ? '新建项目' : '编辑项目'" :close-on-click-modal="false" |
| 3 | - :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> | 4 | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px"> |
| 5 | <el-form-item label="项目名称" prop="projectName"> | 5 | <el-form-item label="项目名称" prop="projectName"> |
| 6 | <el-input v-model="dataForm.projectName" placeholder="项目名称" /> | 6 | <el-input v-model="dataForm.projectName" placeholder="项目名称" /> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/tableDemo/postilTable/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="添加批注" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="添加批注" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-input v-model="text" placeholder="输入内容" type="textarea" :rows="3" /> | 4 | <el-input v-model="text" placeholder="输入内容" type="textarea" :rows="3" /> |
| 5 | <el-timeline class="timeline"> | 5 | <el-timeline class="timeline"> |
| 6 | <el-timeline-item v-for="(item, index) in activities" :key="index"> | 6 | <el-timeline-item v-for="(item, index) in activities" :key="index"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zdjsl/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zdjsl/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 2 | + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 3 | <el-row :gutter="15" class="" > | 3 | <el-row :gutter="15" class="" > |
| 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> | 4 | <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaArticle/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaArticle/View.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="查看详情" :close-on-press-escape="false" :close-on-click-modal="false" | 2 | <el-dialog title="查看详情" :close-on-press-escape="false" :close-on-click-modal="false" |
| 3 | - :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="80%"> | 3 | + :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="80%" append-to-body modal-append-to-body> |
| 4 | <div class="notice-wapper"> | 4 | <div class="notice-wapper"> |
| 5 | <h1 class="title">{{dataForm.title}}</h1> | 5 | <h1 class="title">{{dataForm.title}}</h1> |
| 6 | <div class="info"> | 6 | <div class="info"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaBill/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaCapital/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaClue/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaCustomer/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaCustomerTrack/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaFinwater/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaGoods/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaPrice/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaProContract/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaProCost/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaProduct/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaProfit/Form.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="添加分配信息" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="添加分配信息" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-input v-model="text" placeholder="输入具体内容" type="textarea" :rows="3" /> | 4 | <el-input v-model="text" placeholder="输入具体内容" type="textarea" :rows="3" /> |
| 5 | <el-timeline class="timeline"> | 5 | <el-timeline class="timeline"> |
| 6 | <el-timeline-item v-for="(item, index) in activities" :key="index"> | 6 | <el-timeline-item v-for="(item, index) in activities" :key="index"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaProjectgantt/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaWfAssignment/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaWfFinrmbt/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaWfReports/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyOaWfSeal/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbContract/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbExpert/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbPartner/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbPartnerbill/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbSupplier/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfBidenroll/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfConsult/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfConsult/SubForm.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="添加项目进度信息" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="添加项目进度信息" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-input v-model="text" placeholder="输入具体内容" type="textarea" :rows="3" /> | 4 | <el-input v-model="text" placeholder="输入具体内容" type="textarea" :rows="3" /> |
| 5 | <el-timeline class="timeline"> | 5 | <el-timeline class="timeline"> |
| 6 | <el-timeline-item v-for="(item, index) in activities" :key="index" type="primary"> | 6 | <el-timeline-item v-for="(item, index) in activities" :key="index" type="primary"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfInvitebids/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfProjectfsr/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfProjectitem/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfProposal/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfTenderinfo/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/extend/zyZbwfTendering/ExportBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" | 2 | <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible" |
| 3 | - class="NCC-dialog NCC-dialog_center" lock-scroll width="600px"> | 3 | + class="NCC-dialog NCC-dialog_center" lock-scroll width="600px" append-to-body modal-append-to-body> |
| 4 | <el-form label-position="top" label-width="80px"> | 4 | <el-form label-position="top" label-width="80px"> |
| 5 | <el-form-item label="数据选择"> | 5 | <el-form-item label="数据选择"> |
| 6 | <el-radio-group v-model="type"> | 6 | <el-radio-group v-model="type"> |
Antis.Erp.Plat/antis-ncc-admin/src/views/generator/AddBox.vue
| 1 | <template> | 1 | <template> |
| 2 | <el-dialog title="新建" :close-on-click-modal="false" lock-scroll v-bind="$attrs" v-on="$listeners" | 2 | <el-dialog title="新建" :close-on-click-modal="false" lock-scroll v-bind="$attrs" v-on="$listeners" |
| 3 | - class="NCC-dialog NCC-dialog_center" width="800px"> | 3 | + class="NCC-dialog NCC-dialog_center" width="800px" append-to-body modal-append-to-body> |
| 4 | <div class="add-main"> | 4 | <div class="add-main"> |
| 5 | <div class="add-item add-item-form" @click="add(1)"> | 5 | <div class="add-item add-item-form" @click="add(1)"> |
| 6 | <i class="add-icon el-icon-document"></i> | 6 | <i class="add-icon el-icon-document"></i> |