From f4b315f3b144ecad895249d2280183f1bff33c69 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 10 May 2024 21:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue     |  6 +++---
 src/views/zy/zyGonggao/ZyGonggaoList.vue           | 14 +++++++++-----
 .../zy/zyGonggao/components/ZyGonggaoForm.vue      |  9 +++++++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index a30b583..07cf77a 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -1,10 +1,10 @@
 <template>
-  <div id="siteMain" style="min-height: calc(100vh - 150px);">
+  <div id="siteMain" style="min-height: calc(100vh - 160px);">
             <a-row>
               <a-col :span="24">
                 <a-menu
                   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"
                 >
                   <a-sub-menu key="sub1">
@@ -89,7 +89,7 @@
   #maxSite {
     //最大宽度
     max-width: 1070px;
-    min-height: 750px;
+    min-height: 730px;
     //居中
     margin: 0 auto;
     .rowGutter{
diff --git a/src/views/zy/zyGonggao/ZyGonggaoList.vue b/src/views/zy/zyGonggao/ZyGonggaoList.vue
index dba6986..b9d9364 100644
--- a/src/views/zy/zyGonggao/ZyGonggaoList.vue
+++ b/src/views/zy/zyGonggao/ZyGonggaoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="background: #fff;min-height:97%;margin-top:10px;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -26,7 +26,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable"  style="top: -46px;position: relative;">
       <!--插槽:table标题-->
       <template #tableTitle>
       </template>
@@ -53,7 +53,7 @@
 </template>
 
 <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 { useListPage } from '/@/hooks/system/useListPage';
   import { columns } from './ZyGonggao.data';
@@ -62,11 +62,15 @@
   import ZyGonggaoModal from './components/ZyGonggaoModal.vue';
   import { defHttp } from '/@/utils/http/axios';
   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 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 registerModal = ref();
   //注册table数据
diff --git a/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue b/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue
index ca91ffb..7dba1e2 100644
--- a/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue
+++ b/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue
@@ -18,19 +18,23 @@
 </template>
 
 <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 { useMessage } from '/@/hooks/web/useMessage';
   import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../ZyGonggao.api';
   import { Form } from 'ant-design-vue';
+  import { useRouter } from 'vue-router';
   
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: ()=>{} },
     formBpm: { type: Boolean, default: true }
   });
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn } = query;//获取传递参数
   const formRef = ref();
   const useForm = Form.useForm;
   const emit = defineEmits(['register', 'ok']);
@@ -67,7 +71,7 @@
    * 新增
    */
   function add() {
-    edit({});
+    edit({rwbh,xqxn});
   }
 
   /**
@@ -105,6 +109,7 @@
         }
       }
     }
+    console.log(`🚀 ~ submitForm ~ model:`, model)
     await saveOrUpdate(model, isUpdate.value)
       .then((res) => {
         if (res.success) {