Release/test 合并上生产 #2

Merged
admin merged 736 commits from release/test into main 2026-09-17 11:50:56 +08:00
2 changed files with 2 additions and 1 deletions
Showing only changes of commit 3598dd0a80 - Show all commits
@@ -324,6 +324,7 @@ describe('LocationsView', () => {
expect(document.body.textContent).not.toContain('所属企业')
expect(document.body.textContent).not.toContain('企业 ID')
expect(document.body.querySelector('.el-drawer')).toBeNull()
expect(document.body.querySelector('.location-editor-dialog .el-form-item:first-child input')?.hasAttribute('disabled')).toBe(true)
})
it('does not provide a detail or edit entry for occupied locations', async () => {
@@ -613,7 +613,7 @@ onMounted(() => {
<el-form ref="formRef" :model="form" :rules="rules" label-position="top" class="editor-form" :disabled="saving">
<div class="editor-field-grid">
<el-form-item label="所属仓库" prop="warehouseId" required>
<el-select v-model="form.warehouseId" filterable placeholder="请选择国内仓" :loading="warehouseLoading">
<el-select v-model="form.warehouseId" filterable placeholder="请选择国内仓" :loading="warehouseLoading" :disabled="editorMode === 'edit'">
<el-option
v-for="warehouse in domesticWarehouses"
:key="String(warehouse.id)"