Browse Source

问题处理

master
siyaqi 2 days ago
parent
commit
62440aa59a
  1. 6
      vue-fastapi-backend/module_admin/dao/datastd_dao.py
  2. 8
      vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
  3. 7
      vue-fastapi-frontend/src/views/datastd/stddict/index.vue

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

@ -337,10 +337,8 @@ class DataStdDao:
DataStdMain.data_std_busi_ownership_prsn.label("data_std_busi_ownership_prsn") DataStdMain.data_std_busi_ownership_prsn.label("data_std_busi_ownership_prsn")
) )
.outerjoin( # 使用left outer join确保即使没有关联code也能返回主表数据 .outerjoin(DataStdMain, DataStdDict.data_std_no == DataStdMain.data_std_no) # 正确方向的左连接
DataStdDict,
DataStdMain.data_std_no == DataStdDict.data_std_no
)
.where(*filters) .where(*filters)
.order_by(desc(DataStdDict.create_time)) # 按创建时间降序排序 .order_by(desc(DataStdDict.create_time)) # 按创建时间降序排序
) )

8
vue-fastapi-frontend/src/views/datastd/stdcode/index.vue

@ -148,7 +148,7 @@
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="handlePagination" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-col> </el-col>
</el-row> </el-row>
@ -214,11 +214,7 @@ const defaultProps = {
const dialogVisible2 = ref(false); const dialogVisible2 = ref(false);
const dialogTitle2 = ref('标准代码'); const dialogTitle2 = ref('标准代码');
const selectedRow = ref(null); // codeItem const selectedRow = ref(null); // codeItem
const handlePagination = (pageNum, pageSize) => {
queryParams.value.pageNum = pageNum;
queryParams.value.pageSize = pageSize;
handleQuery();
};
const getSrcSysName = (id) => { const getSrcSysName = (id) => {
const match = dbResourceOldList.value.find(item => item.id === id); const match = dbResourceOldList.value.find(item => item.id === id);
return match ? match.name : id; return match ? match.name : id;

7
vue-fastapi-frontend/src/views/datastd/stddict/index.vue

@ -212,7 +212,7 @@
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="handlePagination" @pagination="getList"
/> />
</el-col> </el-col>
</el-row> </el-row>
@ -296,11 +296,6 @@ const handleStdClick = (code) => {
}); });
}; };
const handlePagination = (pageNum, pageSize) => {
queryParams.value.pageNum = pageNum;
queryParams.value.pageSize = pageSize;
handleQuery();
};
const transCodetoId = (dataStdNo) => { const transCodetoId = (dataStdNo) => {
const match = stdList.value.find(item => item.dataStdNo === dataStdNo); const match = stdList.value.find(item => item.dataStdNo === dataStdNo);

Loading…
Cancel
Save