From 8d60515c18b53122648681410f785be6e23bbbe6 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 27 Oct 2023 22:35:08 +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

---
 .../KcExportConfigTpkwcqkjzglxPzList.vue      |  4 +--
 src/views/kc/config/tkypList/KcTkypList.vue   | 13 +++++--
 .../kc/config/tkypList/KcTkypListModal.vue    |  2 +-
 src/views/kc/tktj/tkmx/tkmx.vue               | 34 ++++++++++++++-----
 src/views/kc/xxhbtkxx/XxhbtkxxList.vue        | 24 ++++++-------
 5 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
index 3014721..c4ebdb9 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
@@ -64,7 +64,7 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" @click="handleAddYq" preIcon="ant-design:plus-outlined"> 听课要求</a-button>
+        <!-- <a-button type="primary" @click="handleAddYq" preIcon="ant-design:plus-outlined"> 听课要求</a-button> -->
         <!-- <a-button v-if="!roleList.filter(x => x.roleCode == 'admin' ).length" admin type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> -->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <!-- <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
@@ -81,7 +81,7 @@
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
-        <a-button type="primary" @click="handleTkyqList" preIcon="ant-design:plus-outlined"> 听课要求列表查询</a-button>
+        <a-button type="primary" @click="handleTkyqList" preIcon="ant-design:plus-outlined"> 听课要求</a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
diff --git a/src/views/kc/config/tkypList/KcTkypList.vue b/src/views/kc/config/tkypList/KcTkypList.vue
index f36dbc0..a494d5a 100644
--- a/src/views/kc/config/tkypList/KcTkypList.vue
+++ b/src/views/kc/config/tkypList/KcTkypList.vue
@@ -4,7 +4,7 @@
     <!--引用表格-->
     <BasicTable @register="registerTable" >
       <template #tableTitle>
-        
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -17,7 +17,8 @@
     </BasicTable>
     <!-- 表单区域 -->
     <KcTksfrzbModal ref="registerYqModal" @success="handleSuccess"></KcTksfrzbModal>
-
+    <KcExportConfigTpkwcqkjzglxModal ref="registerModal" @success="handleSuccess"></KcExportConfigTpkwcqkjzglxModal>
+    
 
   </div>
 </template>
@@ -35,6 +36,7 @@
   import { JInput } from '/@/components/Form';
   import { getSysConfig } from '/@/views/site/utils/index';
   import { getUserInfo, getUserId } from '/@/views/site/utils/index';
+  import KcExportConfigTpkwcqkjzglxModal from '/@/views/kc/config/components/KcExportConfigTpkwcqkjzglxModal.vue'
 
   const roleList = computed(() => getUserInfo()?.roleList??[]);
 
@@ -107,6 +109,13 @@
     sm: { span: 16 },
   });
 
+  
+  const registerModal = ref();
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
   /**
    * 编辑事件
    */
diff --git a/src/views/kc/config/tkypList/KcTkypListModal.vue b/src/views/kc/config/tkypList/KcTkypListModal.vue
index 6e6aaf6..7f2c724 100644
--- a/src/views/kc/config/tkypList/KcTkypListModal.vue
+++ b/src/views/kc/config/tkypList/KcTkypListModal.vue
@@ -9,7 +9,7 @@
   import KcTkypList from './KcTkypList.vue'
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerTkypForm = ref();
diff --git a/src/views/kc/tktj/tkmx/tkmx.vue b/src/views/kc/tktj/tkmx/tkmx.vue
index a8267ef..5127e66 100644
--- a/src/views/kc/tktj/tkmx/tkmx.vue
+++ b/src/views/kc/tktj/tkmx/tkmx.vue
@@ -4,18 +4,33 @@
     <!--查询区域-->
       <a-form @keyup.enter.native="searchQuery" :model="queryParam"  >
         <a-row :gutter="24">
-          <a-col :span="3">
+          <a-col :span="6">
             <a-form-item label="">
               <!-- <JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/> -->
               <j-dict-select-tag placeholder="听课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
             </a-form-item>
           </a-col> 
-          <a-col :span="4">
+          <a-col :span="6">
             <a-form-item label="">
               <JDictSelectTag placeholder="听课人所在单位" v-model:value="queryParam.szdw"  :dictCode="`tkrszdw_view,college,college`"/>
             </a-form-item>
           </a-col>
-          <a-col :span="4">
+          <a-col :span="6">
+            <a-form-item label="">
+              <JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="">
+              <JDictSelectTag placeholder="课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学期" v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="4">
             <a-form-item label="">
               <a-date-picker
                 :showTime="false"
@@ -34,13 +49,13 @@
                 v-model:value="queryParam.endTime"
               ></a-date-picker>
             </a-form-item>
-          </a-col>
-          <a-col :span="3">
+          </a-col> -->
+          <a-col :span="6">
             <a-form-item label="">
               <a-input placeholder="填写教师名称" v-model:value="queryParam.jsxm" dictCode="is_open"/>
             </a-form-item>
           </a-col>
-          <a-col :span="4">
+          <a-col :span="6">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button  type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
@@ -108,9 +123,10 @@ import { getSysConfig } from '/@/views/site/utils/index';
 
   //进入就加载
   onMounted(() => {
-    const format = 'yyyy-MM-dd';
-    queryParam.value.startTime =  dateFormat(getSysConfig().bxqkssj, format)
-    queryParam.value.endTime =  dateFormat(new Date(), format)
+    // const format = 'yyyy-MM-dd';
+    // queryParam.value.startTime =  dateFormat(getSysConfig().bxqkssj, format)
+    // queryParam.value.endTime =  dateFormat(new Date(), format)
+    queryParam.value.xnxq = getSysConfig().flag1
   });
    
   /**
diff --git a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
index 664e6fc..1f43536 100644
--- a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
+++ b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
@@ -15,13 +15,13 @@
             </a-form-item>
           </a-col>
           
-          <a-col :lg="8">
+          <!-- <a-col :lg="8">
             <a-form-item label="创建人">
               <j-input placeholder="请输入创建人" v-model:value="queryParam.cjr"></j-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <!--<template v-if="toggleSearchStatus">-->
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="手机号">
                 <j-input placeholder="请输入手机号" v-model:value="queryParam.sjh"></j-input>
               </a-form-item>
@@ -30,7 +30,7 @@
               <a-form-item label="调课事由">
                 <j-input placeholder="请输入调课事由" v-model:value="queryParam.tksy"></j-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <!-- <a-col :lg="8">
               <a-form-item label="xyjwmsshyj">
                 <j-input placeholder="请输入xyjwmsshyj" v-model:value="queryParam.xyjwmsshyj"></j-input>
@@ -71,11 +71,11 @@
                 <j-input placeholder="请输入lcjgbh" v-model:value="queryParam.lcjgbh"></j-input>
               </a-form-item>
             </a-col> -->
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="补课计划">
                 <j-input placeholder="请输入补课计划" v-model:value="queryParam.bkjh"></j-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="8">
               <a-form-item label="时间戳">
                 <j-input placeholder="请输入时间戳" v-model:value="queryParam.timestamps"></j-input>
@@ -91,22 +91,22 @@
                 <j-input placeholder="请输入pbh" v-model:value="queryParam.pbh"></j-input>
               </a-form-item>
             </a-col> -->
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="教材">
                 <j-input placeholder="请输入教材" v-model:value="queryParam.jc"></j-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="8">
               <a-form-item label="上课日期">
                 <j-input placeholder="请输入上课日期" v-model:value="queryParam.skrq"></j-input>
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="课程信息编号">
                 <j-input placeholder="请输入课程信息编号" v-model:value="queryParam.kcxxbh"></j-input>
               </a-form-item>
-            </a-col>
-            <a-col :lg="8">
+            </a-col> -->
+            <!-- <a-col :lg="8">
               <a-form-item label="校区">
                 <j-input placeholder="请输入校区" v-model:value="queryParam.xq"></j-input>
               </a-form-item>
@@ -125,7 +125,7 @@
               <a-form-item label="授课教室">
                 <j-input placeholder="请输入授课教室" v-model:value="queryParam.skjs"></j-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <!-- <a-col :lg="8">
               <a-form-item label="lcbh">
                 <j-input placeholder="请输入lcbh" v-model:value="queryParam.lcbh"></j-input>