diff --git a/src/components/DynamicTree/index.vue b/src/components/DynamicTree/index.vue
index 11a7d5f..2e1b9bc 100644
--- a/src/components/DynamicTree/index.vue
+++ b/src/components/DynamicTree/index.vue
@@ -84,7 +84,7 @@
}
})
- const emit = defineEmits('selectTree', 'delTree')
+ const emits = defineEmits('selectTree', 'delTree')
const tool = [
{
@@ -117,7 +117,7 @@
const handleTreeClick = (selectedKeys, event) => {
treeRow = event.node
- emit('selectTree', treeRow)
+ emits('selectTree', treeRow)
}
const handleAddTree = () => {
diff --git a/src/components/OperationalInformation/index.vue b/src/components/OperationalInformation/index.vue
new file mode 100644
index 0000000..f8ce042
--- /dev/null
+++ b/src/components/OperationalInformation/index.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/basicData/stash/detail/index.vue b/src/views/basicData/stash/detail/index.vue
index 22eea6e..3f185ae 100644
--- a/src/views/basicData/stash/detail/index.vue
+++ b/src/views/basicData/stash/detail/index.vue
@@ -26,9 +26,6 @@
ref="formRef2"
/>
-
-
-
{
+ if (item.name === 'parentId') {
+ item.attrs.options = sysStoreTreeList
+ }
+ })
+ }
})
let activeKey = ref('1')
diff --git a/src/views/basicData/tissue/detail/TissueForm.vue b/src/views/basicData/tissue/detail/TissueForm.vue
index c4d76e0..5e5ba66 100644
--- a/src/views/basicData/tissue/detail/TissueForm.vue
+++ b/src/views/basicData/tissue/detail/TissueForm.vue
@@ -95,6 +95,8 @@
+
+
关闭
@@ -119,6 +121,7 @@
enabledState: 'ENABLE'
}
const formData = ref({})
+ const detailData = ref({})
const submitLoading = ref(false)
const typeOptions = ref([])
const enabledStateOptions = ref([])
@@ -131,6 +134,7 @@
pageType.value = record.pageType
let recordData = cloneDeep(record)
formData.value = Object.assign({}, recordData)
+ detailData.value = Object.assign({}, recordData)
} else {
pageType.value = 'ADD'
formData.value = formData_enum
diff --git a/src/views/basicData/tissue/index.vue b/src/views/basicData/tissue/index.vue
index 5cd2c58..546d84b 100644
--- a/src/views/basicData/tissue/index.vue
+++ b/src/views/basicData/tissue/index.vue
@@ -54,7 +54,7 @@
getTree: productionOrganizationApi.productionOrganizationTree,
delTree: productionOrganizationApi.productionOrganizationDelete
}"
- @selectTree="selectTree"
+ @selectTree="onSelectTree"
@delTree="delTree"
:toolConfig="{
plus: false,
@@ -212,7 +212,7 @@
const TissueFormRef = ref(null)
const dynamicTreeRef = ref(null)
- const selectTree = (value) => {
+ const onSelectTree = (value) => {
searchFormState.value.parentId = value.id
tableRef.value.refresh()
}
diff --git a/src/views/basicData/unit/columns/unitColumns.js b/src/views/basicData/unit/columns/unitColumns.js
index 6c62a3c..d4025de 100644
--- a/src/views/basicData/unit/columns/unitColumns.js
+++ b/src/views/basicData/unit/columns/unitColumns.js
@@ -30,7 +30,7 @@ export const unitColumns = [
{
title: '是否基本单位',
dataIndex: 'isBase',
- width: 80,
+ width: 200,
resizable: true,
align: 'center'
}
diff --git a/src/views/basicData/unit/index.vue b/src/views/basicData/unit/index.vue
index 1710a77..8b1a47e 100644
--- a/src/views/basicData/unit/index.vue
+++ b/src/views/basicData/unit/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -114,8 +114,8 @@
启用
停用
-
- {{ $TOOL.dictTypeData('OFFICIAL_ACCOUNT_TYPE', record.type) }}
+
+ {{ $TOOL.dictTypeData('YES_NO', record.isBase) }}
@@ -151,7 +151,7 @@
-
+