{{
- row.dictLevel === "company"
+ row.dataDictVest === "company"
? "公司级"
: "系统级(" + row.sysName + ")"
}}
@@ -280,7 +280,7 @@ const total = ref(0);
const loading = ref(false);
const stdVisible = ref(false);
const ids = ref([]);
-const codeNums = ref([]);
+const cdNos = ref([]);
const dbResourceOptions = ref([]);
const handleStdClick = (id) => {
@@ -313,7 +313,7 @@ const handleSelectionChange = (selection) => {
single.value = selection.length !== 1;
multiple.value = !selection.length;
ids.value = selection.map((item) => item.id);
- codeNums.value = selection.map((item) => item.dictNum);
+ cdNos.value = selection.map((item) => item.dictNum);
};
const getList = async () => {
@@ -349,7 +349,7 @@ const resetQuery = () => {
const handleRemove = (row) => {
const idsToDelete = row.id ? [row.id] : ids.value;
- const codesToDelete = row.codeNum ? [row.codeNum] : codeNums.value;
+ const codesToDelete = row.cdNo ? [row.cdNo] : cdNos.value;
proxy.$modal
.confirm(
'是否确认删除字典编号为"' + codesToDelete.toString() + '"的数据项?'
@@ -369,7 +369,7 @@ const handleAdd = () => {
console.log("update:visible", 111);
isEdit.value = false;
selectedRow.value = {
- dictLevel: "company",
+ dataDictVest: "company",
sysId: 10000,
sysName: "公司级",
dictType: "",
diff --git a/vue-fastapi-frontend/src/views/system/flow/codeItemCommon.vue b/vue-fastapi-frontend/src/views/system/flow/codeItemCommon.vue
index 24d540a..04624df 100644
--- a/vue-fastapi-frontend/src/views/system/flow/codeItemCommon.vue
+++ b/vue-fastapi-frontend/src/views/system/flow/codeItemCommon.vue
@@ -3,18 +3,21 @@
-
- 代码归属: {{ form.sysName || '暂无代码归属' }}
-
+
+ 代码归属 :公司级
+
+ 代码归属 :{{ getSrcSysName(form.srcSys) }}
+
+
- 代码编号: {{ form.codeNum || '暂无代码编号' }}
+ 代码编号: {{ form.cdNo || '暂无代码编号' }}
- 代码名称: {{ form.codeName || '暂无代码名称' }}
+ 代码名称: {{ form.cdValCnMean || '暂无代码名称' }}
@@ -23,9 +26,9 @@
-
+
@@ -64,7 +67,7 @@
@@ -84,7 +87,10 @@ import { listStdCodeApprById,getStdCodeAppr} from "@/api/datastd/std"; // 更新
const { proxy } = getCurrentInstance();
const { std_code_status } = proxy.useDict("std_code_status");
+import useUserStore from '@/store/modules/user'; // 注意路径是否正确
+const userStore = useUserStore(); // 正确调用
+const dsSysList = userStore.dsSysList; // 访问属性
const props = defineProps({
codeId: {
type: Object,
@@ -92,12 +98,15 @@ const props = defineProps({
}
});
-console.log(props.codeNum)
+const getSrcSysName = (id) => {
+ const match = dsSysList.find(item => item.id === id);
+ return match ? match.name : id;
+};
const queryParams = ref({
- codeNum: '',
+ cdNo: '',
parentId: props.codeId,
- codeName: '',
- codeType: '',
+ cdValCnMean: '',
+ cdType: '',
sysName: '',
classId: 'codeItem',
sysId: '',
@@ -107,10 +116,10 @@ const queryParams = ref({
const form = ref({
id: "",
- codeNum: '',
- codeName: '',
- codeType: 'company',
- codeStatus: '',
+ cdNo: '',
+ cdValCnMean: '',
+ cdType: 'company',
+ cdValStat: '',
sysName: '',
classId: 'code',
codeMapId: '',
@@ -129,7 +138,7 @@ const multiple = ref(false);
//初始话判断展示系统及映射下拉选
if (props.codeId) {
form.value = { ...props.rowData };
- if (form.value.codeType == "sys") {
+ if (form.value.cdType == "sys") {
showSys.value = true;
} else {
showSys.value = false;
diff --git a/vue-fastapi-frontend/src/views/system/flow/dataStdCodeAppr.vue b/vue-fastapi-frontend/src/views/system/flow/dataStdCodeAppr.vue
index 6d52558..43e4e36 100644
--- a/vue-fastapi-frontend/src/views/system/flow/dataStdCodeAppr.vue
+++ b/vue-fastapi-frontend/src/views/system/flow/dataStdCodeAppr.vue
@@ -12,7 +12,7 @@
{{
- row.dictLevel === 'company'
+ row.dataDictVest === 'company'
? '公司级'
: '系统级(' + row.sysName + ')'
}}
@@ -27,8 +27,8 @@
-
-
+
+
@@ -45,7 +45,7 @@
-
+
查看
diff --git a/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue b/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
index 6c8df57..7ab2362 100644
--- a/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
+++ b/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
@@ -12,7 +12,7 @@
{{
- row.dictLevel === 'company'
+ row.dataDictVest === 'company'
? '公司级'
: '系统级(' + row.sysName + ')'
}}
@@ -71,14 +71,14 @@
-
+
-
+
字典归属:
-
- {{ formatValue(formData.dictLevel === 'company' ? '公司级' : '系统级(' + formData.sysName + ')') }}
+
+ {{ formatValue(formData.dataDictVest === 'company' ? '公司级' : '系统级(' + formData.sysName + ')') }}
diff --git a/vue-fastapi-frontend/src/views/system/flow/dataStdMainAppr.vue b/vue-fastapi-frontend/src/views/system/flow/dataStdMainAppr.vue
index ad905e0..8087187 100644
--- a/vue-fastapi-frontend/src/views/system/flow/dataStdMainAppr.vue
+++ b/vue-fastapi-frontend/src/views/system/flow/dataStdMainAppr.vue
@@ -18,7 +18,7 @@
-
+
{{ changeTypeMap[row.changeType] || row.changeType }}
@@ -122,11 +122,11 @@
-
+
- 代码编号:
+ 代码编号:
- {{ formatValue(formData.codeNum) }}
+ {{ formatValue(formData.cdNo) }}