From 5f4e60a70fdd3a519ac4163f5194994ef55ffd3a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 7 Sep 2024 16:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue     |  6 +----
 .../src/views/bl/zjSqxx/ZjSqxxList.vue        | 14 ++++-------
 .../bl/zjSqxx/components/ZjSqxxEditForm.vue   | 24 +++++++++----------
 .../views/bl/zjSqxx/components/ZjSqxxForm.vue | 22 ++++++++---------
 4 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue
index d182e5c..5a2045d 100644
--- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue
+++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList2.vue
@@ -53,14 +53,10 @@
                 <j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear ></j-input>
               </a-form-item>
             </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
+          <a-col :span="18" style="text-align: right;">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                 <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
-              </a-col>
-            </span>
           </a-col>
         </a-row>
       </a-form>
diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
index 09a0234..6ac1ff8 100644
--- a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
+++ b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
@@ -4,37 +4,33 @@
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="mdule-box">
         <a-row :gutter="24">
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="zjNo">
               <template #label><span title="教工号">教工号</span></template>
               <a-input placeholder="请输入教工号" v-model:value="queryParam.zjNo" allow-clear ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="zjName">
               <template #label><span title="专家姓名">专家姓名</span></template>
               <a-input placeholder="请输入专家姓名" v-model:value="queryParam.zjName" allow-clear ></a-input>
             </a-form-item>
           </a-col>
-            <a-col :lg="6">
+            <a-col :lg="5">
               <a-form-item name="sqfw">
                 <template #label><span title="授权范围">授权范围</span></template>
                 <j-dict-select-tag placeholder="请选择授权范围" v-model:value="queryParam.sqfw" dictCode="zj_sqfw" allow-clear />
               </a-form-item>
             </a-col>
-            <a-col :lg="6">
+            <a-col :lg="5">
               <a-form-item name="sqzt">
                 <template #label><span title="授权状态">授权状态</span></template>
                 <j-dict-select-tag placeholder="请选择授权状态" v-model:value="queryParam.sqzt" dictCode="zj_sqzt" allow-clear />
               </a-form-item>
             </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
+          <a-col :lg="4">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-              </a-col>
-            </span>
           </a-col>
         </a-row>
       </a-form>
diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
index 45da966..b300592 100644
--- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
+++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
@@ -43,12 +43,12 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xqxn" placeholder="请选择学年学期" allow-clear />
+                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xqxn" placeholder="请选择学年学期，如果不选，默认全部" allow-clear />
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="开课单位" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -58,13 +58,13 @@
                 </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
-                    <JSelectMultiple v-model:value="formData.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kclb" placeholder="请选择开课单位，如果不选，默认全部" dictCode="kcxz"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="课程名称" id="ZjSqxxForm-kcmc" name="kcmc">
                     <a-input-group compact>
-                      <a-input v-model:value="formData.kcmc" style="width: calc(100% - 64px)" disabled placeholder="请输入课程名称" />
+                      <a-input v-model:value="formData.kcmc" style="width: calc(100% - 64px)" disabled placeholder="请选择课程名称" />
                       <a-button type="primary" @click="handleKecheng">选择</a-button>
                     </a-input-group>
                   </a-form-item>
@@ -98,12 +98,12 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xqxn" placeholder="请选择学年学期" allow-clear />
+                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xqxn" placeholder="请选择学年学期，如果不选，默认全部" allow-clear />
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="开课单位" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
@@ -143,12 +143,12 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="毕业年份" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xnxq" placeholder="请选择毕业年份" allow-clear />
+                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xnxq" placeholder="请选择毕业年份，如果不选，默认全部" allow-clear />
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="所属院系名称" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择所属院系名称，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -158,7 +158,7 @@
                 </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="毕业论文（设计）类别" id="ZjSqxxForm-kcmc" name="kcmc">
-                    <JSelectMultiple v-model:value="formData.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kclb" placeholder="请选择毕业论文（设计）类别" dictCode="kcxz"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -168,7 +168,7 @@
               <a-row>
                 <a-col :span="24">
                   <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xqxn" placeholder="请选择学年学期" allow-clear />
+                    <j-dict-select-tag v-model:value="formData.xnxq" dictCode="xqxn" placeholder="请选择学年学期，如果不选，默认全部" allow-clear />
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
@@ -195,7 +195,7 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="开课单位" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -205,7 +205,7 @@
                 </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
-                    <JSelectMultiple v-model:value="formData.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="formData.kclb" placeholder="请选择开课单位，如果不选，默认全部" dictCode="kcxz"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue
index 57b5639..40f48d5 100644
--- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue
+++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue
@@ -47,12 +47,12 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期" dictCode="xqxn"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期，如果不选，默认全部" dictCode="xqxn"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="开课单位" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -62,7 +62,7 @@
                 </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
-                    <JSelectMultiple v-model:value="item.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kclb" placeholder="请选择课程类别，如果不选，默认全部" dictCode="kcxz"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
@@ -102,12 +102,12 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期" dictCode="xqxn"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期，如果不选，默认全部" dictCode="xqxn"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="开课单位" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
@@ -147,12 +147,12 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="毕业年份" id="ZjSqxxForm-xnxq" name="xnxq">
-                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择毕业年份" dictCode="xnxq"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择毕业年份，如果不选，默认全部" dictCode="xnxq"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="所属院系名称" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择所属院系名称，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -162,7 +162,7 @@
                 </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="毕业论文（设计）类别" id="ZjSqxxForm-kcmc" name="kcmc">
-                    <JSelectMultiple v-model:value="item.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kclb" placeholder="请选择毕业论文（设计）类别，如果不选，默认全部" dictCode="kcxz"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -173,7 +173,7 @@
                 <a-col :span="24">
                   <a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
                     <!-- <j-dict-select-tag v-model:value="item.xnxq" dictCode="xqxn" placeholder="请选择学年学期" allow-clear /> -->
-                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期" dictCode="xnxq"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.xnxq" placeholder="请选择学年学期，如果不选，默认全部" dictCode="xnxq"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
@@ -200,7 +200,7 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="开课单位" id="ZjSqxxForm-kkdw" name="kkdw">
-                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位，如果不选，默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -210,7 +210,7 @@
                 </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
-                    <JSelectMultiple v-model:value="item.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
+                    <JSelectMultiple v-model:value="item.kclb" placeholder="请选择课程类别，如果不选，默认全部" dictCode="kcxz"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">