diff --git a/src/views/kc/kcErrorreport/JscjErrorList.vue b/src/views/kc/kcErrorreport/JscjErrorList.vue index 57175f8..fce5eb4 100644 --- a/src/views/kc/kcErrorreport/JscjErrorList.vue +++ b/src/views/kc/kcErrorreport/JscjErrorList.vue @@ -1,7 +1,7 @@ - + @@ -9,6 +9,8 @@ + + @@ -21,6 +23,7 @@ import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue'; + import KcKechengbiaoListPage from '/@/views/kc/ktgl/KcKechengbiaoList.vue'; const queryParam = ref({}); //注册table数据 @@ -32,6 +35,13 @@ canResize:false, useSearchForm: false, immediate: false, + clickToRowSelect: true, + rowSelection: { + type: 'radio' + }, + pagination: { + pageSize: 5 + }, actionColumn: { width: 120, fixed: 'right', @@ -42,7 +52,7 @@ }, }, }); - const [registerTable, { reload}, { rowSelection, selectedRowKeys }] = tableContext; + const [registerTable, { reload}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext; const labelCol = reactive({ xs: { span: 24 }, sm: { span: 7 }, @@ -67,7 +77,7 @@ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -79,7 +89,7 @@ }, ]; } - + function handleEdit(record: Recordable) { Modal.confirm({ icon: createVNode({}), @@ -114,7 +124,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -124,7 +134,7 @@ //刷新数据 reload(); } - + defineExpose({ zbLoadData diff --git a/src/views/kc/kcErrorreport/KcErrorreportList.vue b/src/views/kc/kcErrorreport/KcErrorreportList.vue index d851e3c..8335489 100644 --- a/src/views/kc/kcErrorreport/KcErrorreportList.vue +++ b/src/views/kc/kcErrorreport/KcErrorreportList.vue @@ -105,7 +105,7 @@ registerModal.value.disableSubmit = false; registerModal.value.add(); } - + /** * 编辑事件 */ @@ -113,7 +113,7 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情 */ @@ -121,28 +121,28 @@ registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - + /** * 删除事件 */ async function handleDelete(record) { await deleteOne({ id: record.id }, handleSuccess); } - + /** * 批量删除事件 */ async function batchHandleDelete() { await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); } - + /** * 成功回调 */ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -154,7 +154,7 @@ }, ]; } - + /** * 下拉操作栏 */ @@ -179,7 +179,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -189,7 +189,7 @@ //刷新数据 reload(); } - + diff --git a/src/views/kc/kcErrorreport/KcxxErrorList.vue b/src/views/kc/kcErrorreport/KcxxErrorList.vue index 0859f38..7afb844 100644 --- a/src/views/kc/kcErrorreport/KcxxErrorList.vue +++ b/src/views/kc/kcErrorreport/KcxxErrorList.vue @@ -1,7 +1,7 @@ - + @@ -9,6 +9,8 @@ + + @@ -21,6 +23,7 @@ import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue'; + import KcKechengbiaoListPage from '/@/views/kc/ktgl/KcKechengbiaoList.vue'; const queryParam = ref({}); //注册table数据 @@ -32,6 +35,13 @@ canResize:false, useSearchForm: false, immediate: false, + clickToRowSelect: true, + rowSelection: { + type: 'radio' + }, + pagination: { + pageSize: 5 + }, actionColumn: { width: 120, fixed: 'right', @@ -42,7 +52,7 @@ }, }, }); - const [registerTable, { reload}, { rowSelection, selectedRowKeys }] = tableContext; + const [registerTable, { reload}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext; const labelCol = reactive({ xs: { span: 24 }, sm: { span: 7 }, @@ -67,7 +77,7 @@ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -79,7 +89,7 @@ }, ]; } - + function handleEdit(record: Recordable) { Modal.confirm({ icon: createVNode({}), @@ -114,7 +124,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -124,7 +134,7 @@ //刷新数据 reload(); } - + defineExpose({ zbLoadData diff --git a/src/views/kc/kcErrorreport/ZbptErrorList.vue b/src/views/kc/kcErrorreport/ZbptErrorList.vue index db646ab..451dcdf 100644 --- a/src/views/kc/kcErrorreport/ZbptErrorList.vue +++ b/src/views/kc/kcErrorreport/ZbptErrorList.vue @@ -1,7 +1,7 @@ - + @@ -9,6 +9,8 @@ + + @@ -21,6 +23,8 @@ import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue'; + import KcKechengbiaoListPage from '/@/views/kc/ktgl/KcKechengbiaoList.vue'; + const queryParam = ref({}); //注册table数据 @@ -32,6 +36,13 @@ canResize:false, immediate: false, useSearchForm: false, + clickToRowSelect: true, + rowSelection: { + type: 'radio' + }, + pagination: { + pageSize: 5 + }, actionColumn: { width: 120, fixed: 'right', @@ -42,7 +53,7 @@ }, }, }); - const [registerTable, { reload}, { rowSelection, selectedRowKeys }] = tableContext; + const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext; const labelCol = reactive({ xs: { span: 24 }, sm: { span: 7 }, @@ -67,7 +78,7 @@ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -79,7 +90,7 @@ }, ]; } - + function handleEdit(record: Recordable) { Modal.confirm({ icon: createVNode({}), @@ -114,7 +125,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -124,7 +135,7 @@ //刷新数据 reload(); } - + defineExpose({ zbLoadData diff --git a/src/views/kc/ktgl/KcKechengbiao.data.ts b/src/views/kc/ktgl/KcKechengbiao.data.ts index e6a2c03..323c4f5 100644 --- a/src/views/kc/ktgl/KcKechengbiao.data.ts +++ b/src/views/kc/ktgl/KcKechengbiao.data.ts @@ -1,128 +1,220 @@ import {BasicColumn} from '/@/components/Table'; import {FormSchema} from '/@/components/Table'; import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; +// import { render } from '/@/utils/common/renderUtils'; +import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types'; //列表数据 -export const columns: BasicColumn[] = [ + +export const columns = ([ { - title: 'id', - align: "center", - width: '0', - dataIndex: 'id', - // ifShow: false, - }, - { - title: '课程号', - align: "center", + title: '课程编号', + align: "left", width: '300px', - dataIndex: 'kcbh' + key: 'kcbh', }, { title: '课程名称', - align: "center", - dataIndex: 'kcmc' + align: "left", + key: 'kcmc' }, { title: '授课教师', - align: "center", - dataIndex: 'skjs' + align: "left", + key: 'skjs' }, { title: '学科人数', - align: "center", + align: "left", width: '80px', - dataIndex: 'xkrs' + key: 'xkrs' }, { title: '开课单位', - align: "center", + align: "left", width: '100px', - dataIndex: 'kkdw_dictText' + key: 'kkdw_dictText' }, { title: '课程性质', - align: "center", + align: "left", width: '105px', - dataIndex: 'kcxz_dictText' + key: 'kcxz_dictText' }, { title: '上课地点', - align: "center", + align: "left", width: '100px', - dataIndex: 'skdd' + key: 'skdd' }, { title: '上课周次', - align: "center", + align: "left", width: '100px', - dataIndex: 'jkzc_dictText' + key: 'jkzc_dictText' }, { title: '节次', - align: "center", + align: "left", width: '70px', - dataIndex: 'hh_dictText' + key: 'hh_dictText' }, { title: '星期', - align: "center", + align: "left", width: '70px', - dataIndex: 'week_dictText' + key: 'week_dictText' }, { title: '学分', - align: "center", + align: "left", width: '50px', - dataIndex: 'xf' + key: 'xf' }, + { title: '是否出镜', - align: "center", - dataIndex: 'sfcj', - edit: true, - editComponent: 'Select', - // editComponentProps: { - // // //选中 - // checkedChildren: "是-", - // // checkedValue: 0, - // // //未选中 - // unCheckedChildren:'否-', - // // unCheckedValue: 1, - // // onClick: (checked: boolean | string | number, event: Event) => { - // // event.stopPropagation(); - // // console.log('选择后回调',checked,event); - - // // } - // }, - // editValueMap: (value) => value == '0'?'是':'否', - // editValueMap: (value) => value?'0':'1', - // format: (text) => ,C - editComponentProps: { - options: [ - { label: '是', value: 0, }, - { label: '否', value: 1, }, - ], - }, - // customRender: (r) => r.text == 0?'是':'否' + key: 'sfcj', + type: JVxeTypes.selectSearch, + width: 100, + options: [ + { label: '是', value: 0, }, + { label: '否', value: 1, }, + ], }, - - { title: '上课形式', - align: "center", - dataIndex: 'skxs', - edit: true, - editComponent: 'Select', - editComponentProps: { - options: [ - { label: '线上', value: 0, }, - { label: '线下', value: 1, }, - { label: '线上线下混合', value: 2, }, - ], - }, - // customRender: (r) => r.text == 0?'线上':r.text == 1?'线下':'线上线下混合' + key: 'skxs', + type: JVxeTypes.selectSearch, + width: 100, + options: [ + { label: '线上', value: 0, }, + { label: '线下', value: 1, }, + { label: '线上线下混合', value: 2, }, + ], }, -]; +]); + + +// export const columns: BasicColumn[] = [ +// { +// title: 'id', +// align: "center", +// width: '0', +// dataIndex: 'id', +// // ifShow: false, +// }, +// { +// title: '课程号', +// align: "center", +// width: '300px', +// dataIndex: 'kcbh' +// }, +// { +// title: '课程名称', +// align: "center", +// dataIndex: 'kcmc' +// }, +// { +// title: '授课教师', +// align: "center", +// dataIndex: 'skjs' +// }, +// { +// title: '学科人数', +// align: "center", +// width: '80px', +// dataIndex: 'xkrs' +// }, +// { +// title: '开课单位', +// align: "center", +// width: '100px', +// dataIndex: 'kkdw_dictText' +// }, +// { +// title: '课程性质', +// align: "center", +// width: '105px', +// dataIndex: 'kcxz_dictText' +// }, +// { +// title: '上课地点', +// align: "center", +// width: '100px', +// dataIndex: 'skdd' +// }, +// { +// title: '上课周次', +// align: "center", +// width: '100px', +// dataIndex: 'jkzc_dictText' +// }, +// { +// title: '节次', +// align: "center", +// width: '70px', +// dataIndex: 'hh_dictText' +// }, +// { +// title: '星期', +// align: "center", +// width: '70px', +// dataIndex: 'week_dictText' +// }, +// { +// title: '学分', +// align: "center", +// width: '50px', +// dataIndex: 'xf' +// }, +// { +// title: '是否出镜', +// align: "center", +// dataIndex: 'sfcj', +// edit: true, +// editComponent: 'Select', +// // editComponentProps: { +// // // //选中 +// // checkedChildren: "是-", +// // // checkedValue: 0, +// // // //未选中 +// // unCheckedChildren:'否-', +// // // unCheckedValue: 1, +// // // onClick: (checked: boolean | string | number, event: Event) => { +// // // event.stopPropagation(); +// // // console.log('选择后回调',checked,event); + +// // // } +// // }, +// // editValueMap: (value) => value == '0'?'是':'否', +// // editValueMap: (value) => value?'0':'1', +// // format: (text) => ,C +// editComponentProps: { +// options: [ +// { label: '是', value: 0, }, +// { label: '否', value: 1, }, +// ], +// }, +// // customRender: (r) => r.text == 0?'是':'否' +// }, + + +// { +// title: '上课形式', +// align: "center", +// dataIndex: 'skxs', +// edit: true, +// editComponent: 'Select', +// editComponentProps: { +// options: [ +// { label: '线上', value: 0, }, +// { label: '线下', value: 1, }, +// { label: '线上线下混合', value: 2, }, +// ], +// }, +// // customRender: (r) => r.text == 0?'线上':r.text == 1?'线下':'线上线下混合' +// }, +// ]; //查询数据 export const searchFormSchema: FormSchema[] = [ diff --git a/src/views/kc/ktgl/KcKechengbiaoList.vue b/src/views/kc/ktgl/KcKechengbiaoList.vue index fd3364c..7547bbe 100644 --- a/src/views/kc/ktgl/KcKechengbiaoList.vue +++ b/src/views/kc/ktgl/KcKechengbiaoList.vue @@ -1,7 +1,7 @@ - + @@ -56,12 +56,9 @@ - 新增 + 新增 修改 删除 - - - - - - - - + diff --git a/src/views/kc/ktgl/KcKetangbiaoList.vue b/src/views/kc/ktgl/KcKetangbiaoList.vue index 3fdb9b2..5bb4977 100644 --- a/src/views/kc/ktgl/KcKetangbiaoList.vue +++ b/src/views/kc/ktgl/KcKetangbiaoList.vue @@ -114,6 +114,7 @@ canResize:false, useSearchForm: false, showActionColumn: false, + clickToRowSelect: true, rowSelection: { type: 'radio' },