From 437cb7c730f55bdb5696f168deae83402a3ff0ff Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 4 Dec 2023 23:46:29 +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

---
 .../config/KcExportConfigTpkwcqkjzglx.api.ts  |  2 +-
 .../KcExportConfigTpkwcqkjzglxPzList.vue      | 12 ++--
 .../kc/config/StaticCon/StaticCon.api.ts      |  2 +-
 src/views/kc/config/StaticCon/StaticCon.vue   |  5 +-
 .../KcKechengtixingdingyue.data.ts            | 14 +++-
 .../KcKechengtixingdingyueList.vue            |  9 +--
 .../kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue | 72 +++++++++++++++++++
 src/views/kc/kcZzThpjb/KcZzThpjbList.vue      | 31 ++++++--
 src/views/kc/kcZzXstkb/KcZzXstkbList.vue      | 39 +++++-----
 src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue      | 27 +++----
 10 files changed, 158 insertions(+), 55 deletions(-)
 create mode 100644 src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue

diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts
index c979745..aeabde4 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.api.ts
@@ -4,7 +4,7 @@ import { useMessage } from "/@/hooks/web/useMessage";
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/config/kcExportConfigTpkwcqkjzglx/list',
+  list = '/config/kcExportConfigTpkwcqkjzglx/list2',
   save='/config/kcExportConfigTpkwcqkjzglx/add',
   edit='/config/kcExportConfigTpkwcqkjzglx/edit',
   deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete',
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
index 0c13ab7..ea2bfd4 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
@@ -38,12 +38,16 @@
               <j-input placeholder="请输入听课类型" v-model:value="queryParam.sf"/>
             </a-form-item>
           </a-col>
-          <a-col :lg="8">
-            <a-form-item label="听课类型">
-              <!-- <j-dict-select-tag placeholder="请输入身份" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/> -->
-              <j-input placeholder="请输入听课类型" v-model:value="queryParam.rjzy"/>
+          <a-col :span="8">
+            <a-form-item label="在职状态">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择在职状态" v-model:value="queryParam.zt" dictCode="kc_export_config_tpkwcqkjzglx,zt,zt,true group by zt"/>
             </a-form-item>
           </a-col>
+          <!-- <a-col :lg="8">
+            <a-form-item label="听课类型">
+              <j-input placeholder="请输入听课类型" v-model:value="queryParam.rjzy"/>
+            </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">
diff --git a/src/views/kc/config/StaticCon/StaticCon.api.ts b/src/views/kc/config/StaticCon/StaticCon.api.ts
index 9720b23..059fdc8 100644
--- a/src/views/kc/config/StaticCon/StaticCon.api.ts
+++ b/src/views/kc/config/StaticCon/StaticCon.api.ts
@@ -10,7 +10,7 @@ enum Api {
   deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete',
   deleteBatch = '/config/kcExportConfigTpkwcqkjzglx/deleteBatch',
   importExcel = '/config/kcExportConfigTpkwcqkjzglx/importExcel',
-  exportXls = '/config/kcExportConfigTpkwcqkjzglx/exportXls',
+  exportXls = '/config/kcExportConfigTpkwcqkjzglx/exportXls2',
 }
 
 /**
diff --git a/src/views/kc/config/StaticCon/StaticCon.vue b/src/views/kc/config/StaticCon/StaticCon.vue
index 27758da..d9d5237 100644
--- a/src/views/kc/config/StaticCon/StaticCon.vue
+++ b/src/views/kc/config/StaticCon/StaticCon.vue
@@ -13,6 +13,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px">导出</a-button>
               </a-col>
             </span>
           </a-col>
@@ -101,8 +102,8 @@
       url: getExportUrl,
       params: () => {
         let params:any = {};
-        params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length
-        params.findGh = getUserId()
+        params.code = queryParam.value.code
+        params.type = queryParam.value.type
         return Object.assign(params,queryParam.value);
       }
     },
diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts
index cf7a092..3f3603f 100644
--- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts
+++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts
@@ -5,12 +5,22 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '账号',
+    title: '所在院校',
+    align: "center",
+    dataIndex: 'dwmc'
+  },
+  {
+    title: '任教专业',
+    align: "center",
+    dataIndex: 'rjzy'
+  },
+  {
+    title: '工号',
     align: "center",
     dataIndex: 'userid'
   },
   {
-    title: '用户名',
+    title: '教师姓名',
     align: "center",
     dataIndex: 'username'
   },
diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
index e2bb3a6..3f22863 100644
--- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
+++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
@@ -5,18 +5,19 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :span="8">
-            <a-form-item label="账号">
-              <j-input placeholder="账号" v-model:value="queryParam.userid"/>
+            <a-form-item label="工号">
+              <j-input placeholder="工号" v-model:value="queryParam.userid"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="用户名">
-              <j-input placeholder="用户名" v-model:value="queryParam.username"/>
+            <a-form-item label="教师姓名">
+              <j-input placeholder="教师姓名" v-model:value="queryParam.username"/>
             </a-form-item>
           </a-col>
           <a-col :span="4">
             <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" @click="onExportXls" style="margin-left: 8px">导出</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue b/src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue
new file mode 100644
index 0000000..a42b39d
--- /dev/null
+++ b/src/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue
@@ -0,0 +1,72 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <KcZwtksfInfoList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></KcZwtksfInfoList>
+  </a-modal>
+</template>
+ 
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import KcZwtksfInfoList from './KcZwtksfInfoList.vue'
+  
+  const title = ref<string>('');
+  const width = ref<string>('80%');
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '映射';
+    visible.value = true;
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/kc/kcZzThpjb/KcZzThpjbList.vue b/src/views/kc/kcZzThpjb/KcZzThpjbList.vue
index 3efe269..2ae88b4 100644
--- a/src/views/kc/kcZzThpjb/KcZzThpjbList.vue
+++ b/src/views/kc/kcZzThpjb/KcZzThpjbList.vue
@@ -4,28 +4,43 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <a-col :span="8">
+            <a-form-item label="学年学期">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="8">
             <a-form-item label="课程编号">
               <a-input placeholder="请输入课程编号" v-model:value="queryParam.kcbh"></a-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :lg="8">
             <a-form-item label="课程名称">
-              <a-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></a-input>
+              <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></j-input>
             </a-form-item>
           </a-col>
           <!--<template v-if="toggleSearchStatus">-->
             <a-col :lg="8">
               <a-form-item label="授课教师">
-                <a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"></a-input>
+                <j-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"></j-input>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
+              <a-form-item label="听课教师工号">
+                <j-input placeholder="请输入听课教师工号" v-model:value="queryParam.pkjsbh"></j-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="听课教师姓名">
+                <j-input placeholder="请输入听课教师姓名" v-model:value="queryParam.pkjsxm"></j-input>
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :lg="8">
               <a-form-item label="授课时间">
                 <a-date-picker valueFormat="YYYY-MM-DD" placeholder="请选择授课时间" v-model:value="queryParam.sksj" style="width:100%"/>
               </a-form-item>
-            </a-col>
-            <a-col :lg="8">
+            </a-col> -->
+            <!-- <a-col :lg="8">
               <a-form-item label="上课地点">
                 <a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
               </a-form-item>
@@ -34,7 +49,7 @@
               <a-form-item label="评价时间">
                 <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择评价时间" v-model:value="queryParam.pjsj" style="width:100%"/>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           <!--</template>-->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -102,6 +117,8 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZzThpjb.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import KcZzThpjbModal from './components/KcZzThpjbModal.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { JInput } from '/@/components/Form';
 
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
diff --git a/src/views/kc/kcZzXstkb/KcZzXstkbList.vue b/src/views/kc/kcZzXstkb/KcZzXstkbList.vue
index 52aa3ad..ccb0cf7 100644
--- a/src/views/kc/kcZzXstkb/KcZzXstkbList.vue
+++ b/src/views/kc/kcZzXstkb/KcZzXstkbList.vue
@@ -4,47 +4,52 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <a-col :span="8">
+            <a-form-item label="学年学期">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="8">
             <a-form-item label="课程编号">
               <a-input placeholder="请输入课程编号" v-model:value="queryParam.kcbh"></a-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :lg="8">
             <a-form-item label="课程名称">
-              <a-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></a-input>
+              <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></j-input>
             </a-form-item>
           </a-col>
           <!--<template v-if="toggleSearchStatus">-->
             <a-col :lg="8">
               <a-form-item label="授课教师">
-                <a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"></a-input>
+                <j-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"></j-input>
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item label="授课时间">
                 <a-date-picker valueFormat="YYYY-MM-DD" placeholder="请选择授课时间" v-model:value="queryParam.sksj" style="width:100%"/>
               </a-form-item>
-            </a-col>
-            <a-col :lg="8">
+            </a-col> -->
+            <!-- <a-col :lg="8">
               <a-form-item label="上课地点">
                 <a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="8">
-              <a-form-item label="听课教师姓名">
-                <a-input placeholder="请输入听课教师姓名" v-model:value="queryParam.tkjsxm"></a-input>
+              <a-form-item label="评课教师工号">
+                <j-input placeholder="请输入评课教师工号" v-model:value="queryParam.tkjsgh"></j-input>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item label="听课教师工号">
-                <a-input placeholder="请输入听课教师工号" v-model:value="queryParam.tkjsgh"></a-input>
+              <a-form-item label="评课教师姓名">
+                <j-input placeholder="请输入评课教师姓名" v-model:value="queryParam.tkjsxm"></j-input>
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
-              <a-form-item label="听课时间">
-                <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择听课时间" v-model:value="queryParam.tksj" style="width:100%"/>
+            <!-- <a-col :lg="8">
+              <a-form-item label="评课时间">
+                <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择评课时间" v-model:value="queryParam.tksj" style="width:100%"/>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           <!--</template>-->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -112,6 +117,8 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZzXstkb.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import KcZzXstkbModal from './components/KcZzXstkbModal.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { JInput } from '/@/components/Form';
 
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
diff --git a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue
index 4e22d7c..bb1a1d6 100644
--- a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue
+++ b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue
@@ -4,40 +4,29 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
-            <a-form-item label="课程编号">
-              <a-input placeholder="请输入课程编号" v-model:value="queryParam.kcbh"></a-input>
+          <a-col :span="8">
+            <a-form-item label="学年学期">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
             </a-form-item>
           </a-col>
           <a-col :lg="8">
             <a-form-item label="课程名称">
-              <a-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></a-input>
+              <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc"></j-input>
             </a-form-item>
           </a-col>
-          <!--<template v-if="toggleSearchStatus">-->
             <a-col :lg="8">
               <a-form-item label="授课教师">
-                <a-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="8">
-              <a-form-item label="授课时间">
-                <a-date-picker valueFormat="YYYY-MM-DD" placeholder="请选择授课时间" v-model:value="queryParam.skrq" style="width:100%"/>
+                <j-input placeholder="请输入授课教师" v-model:value="queryParam.skjs"></j-input>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
               <a-form-item label="听课教师工号">
-                <a-input placeholder="请输入听课教师工号" v-model:value="queryParam.tkjsbh"></a-input>
+                <j-input placeholder="请输入听课教师工号" v-model:value="queryParam.tkjsbh"></j-input>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
               <a-form-item label="听课教师姓名">
-                <a-input placeholder="请输入听课教师姓名" v-model:value="queryParam.tkjsxm"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="8">
-              <a-form-item label="评课时间">
-                <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择评课时间" v-model:value="queryParam.pksj" style="width:100%"/>
+                <j-input placeholder="请输入听课教师姓名" v-model:value="queryParam.tkjsxm"></j-input>
               </a-form-item>
             </a-col>
           <!--</template>-->
@@ -107,6 +96,8 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZzYbtkb.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import KcZzYbtkbModal from './components/KcZzYbtkbModal.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { JInput } from '/@/components/Form';
 
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);