修改bug

This commit is contained in:
yangjun 2024-05-10 21:48:26 +08:00
parent aa2e2bcfcc
commit f4b315f3b1
3 changed files with 19 additions and 10 deletions

View File

@ -1,10 +1,10 @@
<template> <template>
<div id="siteMain" style="min-height: calc(100vh - 150px);"> <div id="siteMain" style="min-height: calc(100vh - 160px);">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-menu <a-menu
v-model:selectedKeys="selectedKeys" v-model:selectedKeys="selectedKeys"
style="width: 98%;min-height: calc(100vh - 130px);margin: 10px 0;" style="width: 98%;min-height: calc(100vh - 142px);margin: 10px 0;"
mode="inline" mode="inline"
> >
<a-sub-menu key="sub1"> <a-sub-menu key="sub1">
@ -89,7 +89,7 @@
#maxSite { #maxSite {
// //
max-width: 1070px; max-width: 1070px;
min-height: 750px; min-height: 730px;
// //
margin: 0 auto; margin: 0 auto;
.rowGutter{ .rowGutter{

View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div style="background: #fff;min-height:97%;margin-top:10px;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -26,7 +26,7 @@
</a-form> </a-form>
</div> </div>
<!--引用表格--> <!--引用表格-->
<BasicTable @register="registerTable"> <BasicTable @register="registerTable" style="top: -46px;position: relative;">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
</template> </template>
@ -53,7 +53,7 @@
</template> </template>
<script lang="ts" name="zyGonggao-zyGonggao" setup> <script lang="ts" name="zyGonggao-zyGonggao" setup>
import { ref, reactive } from 'vue'; import { ref, reactive, unref } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage'; import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './ZyGonggao.data'; import { columns } from './ZyGonggao.data';
@ -62,11 +62,15 @@
import ZyGonggaoModal from './components/ZyGonggaoModal.vue'; import ZyGonggaoModal from './components/ZyGonggaoModal.vue';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage"; import { useMessage } from "/@/hooks/web/useMessage";
import { JJInput } from '/@/components/Form'; import { JInput } from '/@/components/Form';
import { useRouter } from 'vue-router';
const { createConfirm } = useMessage(); const { createConfirm } = useMessage();
const queryParam = ref<any>({}); const { currentRoute } = useRouter();
const { query } = unref(currentRoute);
const { rwbh,xqxn } = query;//
const queryParam = ref<any>({rwbh, xqxn});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref(); const registerModal = ref();
//table //table

View File

@ -18,19 +18,23 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue'; import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted,unref } from 'vue';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue'; import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
import { getValueType } from '/@/utils'; import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../ZyGonggao.api'; import { saveOrUpdate } from '../ZyGonggao.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import { useRouter } from 'vue-router';
const props = defineProps({ const props = defineProps({
formDisabled: { type: Boolean, default: false }, formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: ()=>{} }, formData: { type: Object, default: ()=>{} },
formBpm: { type: Boolean, default: true } formBpm: { type: Boolean, default: true }
}); });
const { currentRoute } = useRouter();
const { query } = unref(currentRoute);
const { rwbh,xqxn } = query;//
const formRef = ref(); const formRef = ref();
const useForm = Form.useForm; const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']); const emit = defineEmits(['register', 'ok']);
@ -67,7 +71,7 @@
* 新增 * 新增
*/ */
function add() { function add() {
edit({}); edit({rwbh,xqxn});
} }
/** /**
@ -105,6 +109,7 @@
} }
} }
} }
console.log(`🚀 ~ submitForm ~ model:`, model)
await saveOrUpdate(model, isUpdate.value) await saveOrUpdate(model, isUpdate.value)
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {