Browse Source

引用代码

master
siyaqi 1 month ago
parent
commit
a7a4ac25d8
  1. 2
      vue-fastapi-backend/module_admin/dao/datastd_dao.py
  2. 1
      vue-fastapi-backend/module_admin/entity/do/datastd_do.py
  3. 1
      vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py
  4. 52
      vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue
  5. 26
      vue-fastapi-frontend/src/views/datastd/main/index.vue
  6. 333
      vue-fastapi-frontend/src/views/datastd/stdcode/codeComponents.vue
  7. 4
      vue-fastapi-frontend/src/views/datastd/stdcode/codeItemCommon.vue

2
vue-fastapi-backend/module_admin/dao/datastd_dao.py

@ -686,7 +686,7 @@ class DataStdDao:
@classmethod
async def update_std_main(cls, db: AsyncSession, update_data: DataStdMainModel):
await db.execute(update(DataStdMain).where(DataStdMain.id == update_data.id).values(**update_data.model_dump()))
await db.execute(update(DataStdMain), [update_data])
await db.flush()
@classmethod

1
vue-fastapi-backend/module_admin/entity/do/datastd_do.py

@ -104,6 +104,7 @@ class DataStdMain(Base):
sys_id = Column(Integer, default=None, comment='归属系统Id')
std_menu = Column(String(200), default=None, comment='标准业务定义')
code_num = Column(String(50), default=None, comment='代码编号')
code_id = Column(String(50), default=None, comment='代码id')
std_status = Column(String(1), default=None, comment='标准状态(1:有效 0:无效)')
buss_dept_id = Column(BigInteger, default=None, comment='业务认责部门')
tech_dept_id = Column(BigInteger, default=None, comment='技术认责部门')

1
vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py

@ -106,6 +106,7 @@ class DataStdMainModel(BaseModel):
sys_id: Optional[int] = Field(default=None, description='归属系统Id')
std_menu: Optional[str] = Field(default=None, description='标准业务定义')
code_num: Optional[str] = Field(default=None, description='代码编号')
code_id: Optional[str] = Field(default=None, description='代码id')
std_status: Optional[str] = Field(default=None, description='标准状态(1:有效 0:无效)')
buss_dept_id: Optional[int] = Field(default=None, description='业务认责部门')
tech_dept_id: Optional[int] = Field(default=None, description='技术认责部门')

52
vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue

@ -40,8 +40,22 @@
</el-select>
</el-form-item>
<el-form-item label="代码编号" prop="codeNum">
<el-input v-model="formData.codeNum" placeholder="请输入代码编号" clearable />
</el-form-item>
<el-input
v-model="formData.codeNum"
placeholder="请输入代码编号"
clearable
style="width: 80%;"
:disabled="true"
/>
<el-button
icon="Edit"
:disabled="single"
@click="codeVisible = true"
style="margin-left: 5px;"
v-hasPermi="['meta:metaSecurityCol:edit']"
></el-button>
</el-form-item>
<el-form-item label="业务认责部门" prop="bussDeptId">
<el-tree-select
v-model="formData.bussDeptId"
@ -93,6 +107,14 @@
</el-form>
<el-dialog title="选择代码" v-model="codeVisible" width="1000px">
<!-- 引入第二个页面组件 -->
<code-components ref="showCodeDialog" v-if="codeVisible" />
<template #footer>
<el-button @click="codeCancel">取消</el-button>
<el-button type="primary" @click="codeSave">确定</el-button>
</template>
</el-dialog>
</el-dialog>
</template>
@ -100,6 +122,8 @@
import { ref, watch } from 'vue';
import { updateStdMain, addStdMain } from '@/api/datastd/std'; //
import { listUser, deptTreeSelect } from "@/api/system/user";
import codeComponents from '../../stdcode/codeComponents.vue';
const { proxy } = getCurrentInstance();
const { std_code_status,std_code_appr } = proxy.useDict("std_code_status","std_code_appr");
@ -118,6 +142,7 @@ const props = defineProps({
type: Boolean,
},
});
//
const formRules = ref({
stdNum: [{ required: true, message: '请输入标准编号', trigger: 'blur' }],
@ -129,7 +154,30 @@ const formRules = ref({
bussUser: [{ required: true, message: '请输入业务认责人', trigger: 'blur' }],
techUser: [{ required: true, message: '请输入技术认责人', trigger: 'blur' }],
});
const codeCancel = () => {
codeVisible.value = false;
};
const codeSave = () => {
console.log("sssss")
const child = proxy.$refs.showCodeDialog;
const mapList=child.selections
if(mapList.length!=1){
proxy.$modal.msgWarning("请选择一条代码进行映射");
}else{
const mapCodeItem=child.selections[0]
formData.value.codeNum=mapCodeItem.codeNum
formData.value.codeId=mapCodeItem.id
codeVisible.value = false;
proxy.$modal.msgSuccess("代码引用成功");
}};
const showSys = ref(false);
const codeVisible = ref(false);
const emit = defineEmits(['update:visible', 'refresh']);
const userList = ref([]);
const formData = ref({ ...props.data });

26
vue-fastapi-frontend/src/views/datastd/main/index.vue

@ -231,7 +231,18 @@
<el-table-column label="类型" prop="stdType" width="150"></el-table-column>
<el-table-column label="标准来源" prop="stdSrc" width="150"></el-table-column>
<el-table-column label="数据类别" prop="dataClas" width="150"></el-table-column>
<el-table-column label="代码编号" prop="codeNum" width="150"></el-table-column>
<el-table-column label="代码编号" prop="codeNum" width="150">
<template #default="scope">
<el-link
type="primary"
:underline="true"
@click="handleCodeClick(scope.row)"
style="cursor: pointer"
>
{{ scope.row.codeNum }}
</el-link>
</template>
</el-table-column>
<el-table-column label="业务认责部门" prop="bussDeptId" width="150"></el-table-column>
<el-table-column label="业务认责人员" prop="bussUser" width="150"></el-table-column>
<el-table-column label="技术认责部门" prop="techDeptId" width="150"></el-table-column>
@ -291,6 +302,10 @@
v-model:visible="dialogVisible"
@refresh="getList"
/>
<el-dialog v-model="codeVisible" width="1000px">
<code-item-common ref="showCodeDialog" v-if="codeVisible" :codeId="codeId"/>
</el-dialog>
</div>
</template>
@ -316,12 +331,13 @@ import {
} from "@/api/datastd/std"; //
import useUserStore from '@/store/modules/user'
import { nextTick } from 'vue'
import codeItemCommon from '../stdcode/codeItemCommon.vue'
import { datasourcetree } from "@/api/meta/metatask";
const { proxy } = getCurrentInstance()
const { hasPermiOr } = auth
const userStore = useUserStore()
const codeVisible = ref(false);
const defaultProps = {
children: 'children',
label: 'contentName',
@ -340,6 +356,7 @@ const single = ref(true);
const multiple = ref(true);
const dialogVisible = ref(false);
const selectedRow = ref(null);
const codeId = ref(null);
const isEdit = ref(false);
const tableData = ref([]);
const total = ref(0);
@ -351,7 +368,12 @@ const handlePagination = (pageNum, pageSize) => {
queryParams.value.pageSize = pageSize;
handleQuery();
};
//
const handleCodeClick = (row) => {
codeId.value=row.codeId
codeVisible.value = true;
};
const resetQuery = () => {
queryParams.value = { stdNum: '', stdMenu: '' , pageNum: 1,
pageSize: 10}

333
vue-fastapi-frontend/src/views/datastd/stdcode/codeComponents.vue

@ -0,0 +1,333 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="dbResoursName"
placeholder="请输入代码分类"
clearable
prefix-icon="search"
style="margin-bottom: 20px"
/>
</div>
<div class="head-container">
<el-tree
:data="dbResourceOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
node-key="id"
default-expand-all
highlight-current
@node-click="handleNodeClick"
>
<template #default="{ node, data }">
<span class="custom-tree-node">
<!-- <i :class="getIconClass(data)"></i> -->
<span>{{ data.name }}</span>
</span>
</template>
</el-tree>
</div>
</el-col>
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryRef" :inline="true">
<el-form-item label="标准代码编号" prop="codeNum">
<el-input v-model="queryParams.codeNum" placeholder="请输入标准代码编号" clearable style="width: 220px" />
</el-form-item>
<el-form-item label="标准代码值" prop="codeName">
<el-input v-model="queryParams.codeName" placeholder="请输入标准代码值" clearable style="width: 220px" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 表格展示 -->
<el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="代码归属" align="center" prop="sysName" />
<el-table-column label="标准代码编号" align="center" prop="codeNum" />
<el-table-column label="标准代码名称" align="center" prop="codeName" >
<template #default="scope">
<el-link
type="primary"
:underline="true"
@click="handleCodeClick(scope.row)"
style="cursor: pointer"
>
{{ scope.row.codeName }}
</el-link>
</template>
</el-table-column>
<el-table-column label="代码状态" align="center" prop="codeStatus">
<template #default="scope">
<dict-tag
:options="std_code_appr"
:value="scope.row.codeStatus"
/>
</template>
</el-table-column>
<el-table-column label="引用情况" align="center" >
<template #default="scope">
<el-link
type="primary"
:underline="true"
@click="handleCodeClick(scope.row)"
style="cursor: pointer"
>
查看
</el-link>
</template>
</el-table-column>
<el-table-column label="代码关系" align="center" >
<template #default="scope">
<el-link
type="primary"
:underline="true"
@click="handleMapCodeClick(scope.row)"
style="cursor: pointer"
>
<span v-if="!scope.row.codeMapName||scope.row.codeType=='company'">代码映射</span>
<span v-else>{{ scope.row.codeMapName }}</span>
</el-link>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="handlePagination" />
</el-col>
</el-row>
<!-- 查看标准代码详情 -->
<el-dialog :title="dialogTitle2" v-model="dialogVisible2" width="1000px">
<!-- 引入第二个页面组件 -->
<code-item ref="editCodeDialog" v-if="dialogVisible2" :rowData="selectedRow" :dbResourceOldList="dbResourceOldList"/>
<template #footer>
<el-button @click="handleCancel2">取消</el-button>
<el-button type="primary" @click="handleSave2">确定</el-button>
</template>
</el-dialog>
<el-dialog v-model="codeVisible" width="1000px">
<!-- 引入第二个页面组件 -->
<code-item-common ref="showCodeDialog" v-if="codeVisible" :codeId="codeMapId"/>
</el-dialog>
<el-dialog v-model="mapVisible" width="1200px">
<!-- 引入第三个页面组件 -->
<code-map ref="showMapCodeDialog" v-if="mapVisible" :codeId="codeMapId"/>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, onMounted, toRefs } from 'vue';
import { listStdCode, addStdCode, getStdCode, updateStdCode, deleteStdCode } from "@/api/datastd/std"; //
import { datasourcetree } from "@/api/meta/metatask";
import { ElLink } from 'element-plus';
import CodeItem from './codeItem.vue'; //
import codeItemCommon from './codeItemCommon.vue'; //
import codeMap from './codeMap'; //
const { proxy } = getCurrentInstance();
const { std_code_status,std_code_appr } = proxy.useDict("std_code_status","std_code_appr");
const queryParams = ref({
codeNum: '',
codeName: '',
codeType: '',
sysName: '',
classId:'code',
sysId: '',
pageNum: 1,
pageSize: 10
});
const single = ref(true);
const multiple = ref(true);
const dbResoursName = ref(undefined);
const defaultProps = {
children: "children",
label: "name"
};
//
const dialogVisible2 = ref(false);
const dialogTitle2 = ref('标准代码');
const selectedRow = ref(null); // codeItem
const handlePagination = (pageNum, pageSize) => {
queryParams.value.pageNum = pageNum;
queryParams.value.pageSize = pageSize;
handleQuery();
};
const filterNode = (value, data) => {
if (!value) return true;
return data.name.indexOf(value) !== -1;
};
const handleNodeClick = (data) => {
if(data==9999){
queryParams.value.sysId =undefined;
}else{
queryParams.value.sysId = data.id;
}
handleQuery();
};
const dbResourceOptions = ref(undefined);
const form = ref({
id: '',
codeNum: '',
codeName: '',
codeType: 'company',
codeStatus: '',
sysName: '',
sysId: undefined
});
const ids = ref([]);
const codeNums = ref([]);
//
const getList = async () => {
loading.value = true;
const response = await listStdCode(queryParams.value);
tableData.value = response.rows;
total.value = response.total;
loading.value = false;
};
const codeVisible = ref(false);
const mapVisible = ref(false);
const codeMapId = ref(null);
const selections = ref(null);
//
const handleCodeClick = (row) => {
codeMapId.value=row.id
codeVisible.value = true;
};
const handleMapCodeClick = (row) => {
codeMapId.value=row.id
mapVisible.value = true;
};
function handleSelectionChange(selection) {
selections.value = selection; //
console.log(selections.value,"子页面选中")
}
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
defineExpose({
selections
});
const resetQuery = () => {
queryParams.value = {
codeNum: '',
codeName: '',
codeType: '',
sysName: '',
sysId: '',
pageNum: 1,
pageSize: 10
};
getList();
};
const handleAdd = () => {
dialogTitle.value = "新增标准代码";
form.value = {
id: '',
codeNum: '',
codeName: '',
codeType: '',
codeStatus: '',
sysName: '',
sysId: '',
};
selectedRow.value={...form.value}
dialogVisible2.value = true;
};
const handleSave2 =async () => {
const child = proxy.$refs.editCodeDialog;
let isSuccess= await child.handleSave()
if(isSuccess){
dialogVisible2.value = false;
handleQuery()
}
};
const handleCancel = () => {
dialogVisible.value = false;
};
const handleCancel2 = () => {
dialogVisible2.value = false;
};
const dbResourceOldList = ref([]);
const tableData = ref([]);
const total = ref(0);
const loading = ref(false);
const dialogVisible = ref(false);
const dialogTitle = ref("");
onMounted(() => {
datasourcetree().then(response => {
dbResourceOldList.value = response.rows;
const childrenList = dbResourceOldList.value.map(element => ({ ...element, parentId: "99999" }));
dbResourceOptions.value = [
{
id: 10000, // ID
name: "公司级代码",
parentId: 0,
children: [] //
},
{
id: 99999,
name: "系统级代码",
parentId: 0,
children: childrenList
},
]; });
getList();
});
</script>
<style scoped>
.app-container {
padding: 20px;
}
.head-container {
margin-bottom: 0px;
}
.custom-tree-node {
display: flex;
align-items: center;
}
.custom-tree-node i {
margin-right: 8px;
}
</style>

4
vue-fastapi-frontend/src/views/datastd/stdcode/codeItemCommon.vue

@ -84,10 +84,10 @@ const props = defineProps({
codeId: {
type: Object,
required: false
},
}
});
console.log(props.codeNum)
const queryParams = ref({
codeNum: '',
parentId: props.codeId,

Loading…
Cancel
Save