前置管理 新增重置功能

前置交互日志 新增详情查询功能

src/views/system/auth/userList/popupPwd.vue

@@ -1,97 +1,97 @@
-<template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible"  title="修改密码">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <el-form-item label="新密码" prop="newPwd">
-                    <el-input v-model="form.newPwd" type="password" placeholder="请输入新密码" show-password />
-                </el-form-item>
-                <el-form-item label="确认密码" prop="confirmPwd">
-                    <el-input v-model="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage } from 'element-plus'
-import { validatePwd } from '@/utils/common'
-import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
-import { debug } from 'console'
-
-const formRef = ref()
-const tableStore = inject('tableStore') as TableStore
-const form = reactive({
-    id: '',
-    newPwd: '',
-    confirmPwd: '',
-    loginName: ''
-})
-const rules = {
-    newPwd: [
-        { required: true, message: '请输入密码', trigger: 'blur' },
-        {
-            min: 6,
-            max: 12,
-            message: '长度在 6 到 12 个字符',
-            trigger: 'blur'
-        },
-        { validator: validatePwd, trigger: 'blur' }
-    ],
-    confirmPwd: [
-        { required: true, message: '请确认密码', trigger: 'blur' },
-        {
-            min: 6,
-            max: 12,
-            message: '长度在 6 到 12 个字符',
-            trigger: 'blur'
-        },
-        {
-            validator: (rule: any, value: string, callback: any) => {
-                if (value === '') {
-                    callback(new Error('请再次输入密码'))
-                } else if (value !== form.newPwd) {
-                    callback(new Error('两次输入密码不一致!'))
-                } else {
-                    callback()
-                }
-            },
-            trigger: 'blur',
-            required: true
-        }
-    ]
-}
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (id: string, loginName: string) => {
-    form.id = id
-    form.loginName = loginName
-    form.newPwd = ''
-    form.confirmPwd = ''
-    dialogVisible.value = true
-}
-const submit = async () => {
-    formRef.value.validate((valid: boolean) => {
-        if (valid) {
-            updatePassword({
-                id: form.id,
-                newPassword: form.newPwd
-            }).then((res: any) => {
-                ElMessage.success('密码修改成功')
-                dialogVisible.value = false
-            })
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog draggable width="500px" v-model="dialogVisible"  title="修改密码">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="新密码" prop="newPwd">
+                    <el-input v-model="form.newPwd" type="password" placeholder="请输入新密码" show-password />
+                </el-form-item>
+                <el-form-item label="确认密码" prop="confirmPwd">
+                    <el-input v-model="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage } from 'element-plus'
+import { validatePwd } from '@/utils/common'
+import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
+import { debug } from 'console'
+
+const formRef = ref()
+const tableStore = inject('tableStore') as TableStore
+const form = reactive({
+    id: '',
+    newPwd: '',
+    confirmPwd: '',
+    loginName: ''
+})
+const rules = {
+    newPwd: [
+        { required: true, message: '请输入密码', trigger: 'blur' },
+        {
+            min: 6,
+            max: 12,
+            message: '长度在 6 到 12 个字符',
+            trigger: 'blur'
+        },
+        { validator: validatePwd, trigger: 'blur' }
+    ],
+    confirmPwd: [
+        { required: true, message: '请确认密码', trigger: 'blur' },
+        {
+            min: 6,
+            max: 12,
+            message: '长度在 6 到 12 个字符',
+            trigger: 'blur'
+        },
+        {
+            validator: (rule: any, value: string, callback: any) => {
+                if (value === '') {
+                    callback(new Error('请再次输入密码'))
+                } else if (value !== form.newPwd) {
+                    callback(new Error('两次输入密码不一致!'))
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'blur',
+            required: true
+        }
+    ]
+}
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (id: string, loginName: string) => {
+    form.id = id
+    form.loginName = loginName
+    form.newPwd = ''
+    form.confirmPwd = ''
+    dialogVisible.value = true
+}
+const submit = async () => {
+    formRef.value.validate((valid: boolean) => {
+        if (valid) {
+            updatePassword({
+                id: form.id,
+                newPassword: form.newPwd
+            }).then((res: any) => {
+                ElMessage.success('密码修改成功')
+                dialogVisible.value = false
+            })
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/system/reportForms/index.vue

@@ -1,133 +1,139 @@
-<template>
-    <div class="default-main">
-        <div v-show="show && lookShow">
-            <TableHeader ref="TableHeaderRef">
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
-        <luckysheet ref="luckysheetRef" v-if="!show" @shutDown="shutDown" />
-        <!-- 查看 -->
-        <look ref="lookRef" v-if="!lookShow" @shutDown="shutDown" />
-        <!-- 绑定 -->
-        <department ref="departmentRef" />
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { delTemplate } from '@/api/harmonic-boot/luckyexcel'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-import luckysheet from './luckysheet.vue'
-import look from './look.vue'
-import department from './department.vue'
-defineOptions({
-    name: 'Distributedphotovoltaic/templateConfiguration'
-})
-const luckysheetRef = ref()
-const lookRef = ref()
-const departmentRef = ref()
-const show = ref(true)
-const lookShow = ref(true)
-const tableStore: any = new TableStore({
-    url: '/harmonic-boot/customReport/getTemplateList',
-    method: 'POST',
-    isWebPaging: true,
-    column: [
-        { field: 'name', title: '报表模板名称' },
-        { field: 'updateBy', title: '操作用户' },
-        { field: 'createTime', title: '创建时间' },
-        { field: 'updateTime', title: '更新时间' },
-        { field: 'activation', title: '状态' },
-        {
-            title: '操作',
-            width: '220',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '查看 ',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        lookShow.value = false
-                        setTimeout(() => {
-                            lookRef.value.open(row)
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        show.value = false
-                        setTimeout(() => {
-                            luckysheetRef.value.open('编辑报表模板', row)
-                        }, 10)
-                    }
-                },
-                // {
-                //     name: 'edit',
-                //     title: '绑定',
-                //     type: 'primary',
-                //     icon: 'el-icon-Plus',
-                //     render: 'basicButton',
-                //     click: row => {
-                //         departmentRef.value.open(row)
-                //     }
-                // },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        delTemplate({ tempId: row.id, deptId: row.deptId }).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {}
-})
-tableStore.table.params = {}
-tableStore.table.params.pageSize = 20
-tableStore.table.params.pageNum = 1
-
-provide('tableStore', tableStore)
-// 关闭
-const shutDown = () => {
-    show.value = true
-    lookShow.value = true
-    tableStore.index()
-}
-const add = () => {
-    show.value = false
-    setTimeout(() => {
-        luckysheetRef.value.open('新增报表模板')
-    }, 10)
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+        <div v-show="show && lookShow">
+            <TableHeader ref="TableHeaderRef">
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+        <luckysheet ref="luckysheetRef" v-if="!show" @shutDown="shutDown" />
+        <!-- 查看 -->
+        <look ref="lookRef" v-if="!lookShow" @shutDown="shutDown" />
+        <!-- 绑定 -->
+        <department ref="departmentRef" />
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { delTemplate } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import luckysheet from './luckysheet.vue'
+import look from './look.vue'
+import department from './department.vue'
+defineOptions({
+    name: 'Distributedphotovoltaic/templateConfiguration'
+})
+const luckysheetRef = ref()
+const lookRef = ref()
+const departmentRef = ref()
+const show = ref(true)
+const lookShow = ref(true)
+const tableStore: any = new TableStore({
+    url: '/harmonic-boot/customReport/getTemplateList',
+    method: 'POST',
+    isWebPaging: true,
+    column: [
+        { field: 'name', title: '报表模板名称' },
+        { field: 'updateBy', title: '操作用户' },
+        { field: 'createTime', title: '创建时间' },
+        { field: 'updateTime', title: '更新时间' },
+        {
+            field: 'activation',
+            title: '状态',
+            formatter(row) {
+                return row.cellValue == 1 ? '激活' : '未激活'
+            }
+        },
+        {
+            title: '操作',
+            width: '220',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看 ',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        lookShow.value = false
+                        setTimeout(() => {
+                            lookRef.value.open(row)
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        show.value = false
+                        setTimeout(() => {
+                            luckysheetRef.value.open('编辑报表模板', row)
+                        }, 10)
+                    }
+                },
+                // {
+                //     name: 'edit',
+                //     title: '绑定',
+                //     type: 'primary',
+                //     icon: 'el-icon-Plus',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         departmentRef.value.open(row)
+                //     }
+                // },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {
+                        delTemplate({ tempId: row.id, deptId: row.deptId }).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {}
+})
+tableStore.table.params = {}
+tableStore.table.params.pageSize = 20
+tableStore.table.params.pageNum = 1
+
+provide('tableStore', tableStore)
+// 关闭
+const shutDown = () => {
+    show.value = true
+    lookShow.value = true
+    tableStore.index()
+}
+const add = () => {
+    show.value = false
+    setTimeout(() => {
+        luckysheetRef.value.open('新增报表模板')
+    }, 10)
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>