From 43a92fb84c83ac8962e6370ed3bdfbce204ca19d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 21 Dec 2023 21:47:19 +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
---
.../KcExportConfigTpkwcqkjzglxListNew.vue | 5 ++++-
.../kc/kcWechatSendLog/KcWechatSendLog.data.ts | 12 ++++++------
.../components/KcWechatSendLogForm.vue | 17 +++++++++++------
src/views/kc/tktj/kcTingke/KcTingkeList.vue | 2 +-
4 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue
index 802604e..327d94f 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue
@@ -15,7 +15,7 @@
查询
Excel导出
- PDF职位映射
+ PDF职位映射
@@ -131,6 +131,7 @@
const KcZwtksfInfoList = ref();
const StaticConXyglyChart = ref();
const StaticConGlyChart = ref();
+ const isAdmin = ref("");
const queryParam = ref({});
@@ -142,6 +143,8 @@
const tjlist = (queryParam) => defHttp.get({ url: '/config/kcExportConfigTpkwcqkjzglx/getTjlist', params:queryParam });
//进入就加载
onMounted(() => {
+ isAdmin.value = roleList.value.filter(x => x.roleCode == 'admin' ).length;
+ console.log(`🚀 ~ file: KcExportConfigTpkwcqkjzglxListNew.vue:147 ~ onMounted ~ isAdmin:`, isAdmin)
queryParam.value.xqxn = getSysConfig().flag1
searchQuery()
});
diff --git a/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts b/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts
index ddfebfa..a01ad60 100644
--- a/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts
+++ b/src/views/kc/kcWechatSendLog/KcWechatSendLog.data.ts
@@ -20,15 +20,15 @@ export const columns: BasicColumn[] = [
dataIndex: 'xqxn'
},
{
- title: '应听课次数',
+ title: '发送内容',
align: "center",
dataIndex: 'ytkcs'
},
- {
- title: '实际听课次数',
- align: "center",
- dataIndex: 'sjtkcs'
- },
+ // {
+ // title: '实际听课次数',
+ // align: "center",
+ // dataIndex: 'sjtkcs'
+ // },
{
title: '发送结果',
align: "center",
diff --git a/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue b/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue
index 7bce1e8..8e1a7fd 100644
--- a/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue
+++ b/src/views/kc/kcWechatSendLog/components/KcWechatSendLogForm.vue
@@ -7,21 +7,26 @@
+
+
+
+
+
-
-
+
+
-
+
@@ -54,7 +59,7 @@
teacherName: '',
xqxn: '',
ytkcs: '',
- sjtkcs: '',
+ // sjtkcs: '',
openid: '',
remark: '',
});
@@ -67,7 +72,7 @@
teacherName: [{ required: true, message: '请输入教师姓名!'},],
xqxn: [{ required: true, message: '请选择学期学年!'},],
ytkcs: [{ required: true, message: '请输入应听课次数!'},],
- sjtkcs: [{ required: true, message: '请输入实际听课次数!'},],
+ // sjtkcs: [{ required: true, message: '请输入实际听课次数!'},],
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
diff --git a/src/views/kc/tktj/kcTingke/KcTingkeList.vue b/src/views/kc/tktj/kcTingke/KcTingkeList.vue
index 1528d3b..b71c3d9 100644
--- a/src/views/kc/tktj/kcTingke/KcTingkeList.vue
+++ b/src/views/kc/tktj/kcTingke/KcTingkeList.vue
@@ -6,7 +6,7 @@
-
+