修改页面

Admin

2022-07-05 2a389d383a9872157f7bc961f216ad010d24d29b

修改页面

 src/views/specialWorkSystem/approvalProcess/addApproveProcess/index.vue

@@ -55,7 +55,6 @@
    import { initBackEndControlRoutes } from '/@/router/backEnd';
    import {useUserInfo} from "/@/stores/userInfo";
    import { Session } from '/@/utils/storage';
    import { ElMessage } from 'element-plus'
    import type { FormInstance, FormRules } from 'element-plus'

    let global: any = {

 src/views/specialWorkSystem/approvalProcess/approveProcessManagement/index.vue

@@ -231,7 +231,6 @@
        .el-row{
            display: flex;
            align-items: center;
            margin-bottom: 20px;
            &:last-child {
                margin-bottom: 0;
            }
@@ -271,6 +270,7 @@
                display: flex;
                align-items: center;
                justify-content: space-between;
                margin-bottom: 20px;
                .mainCardBtn{
                    margin: 0;
                }

 src/views/specialWorkSystem/approvalProcess/approveProcessSetting/index.vue

@@ -26,7 +26,7 @@
            <el-button type="primary" @click="confirmEdit" size="large">确认</el-button>
            <el-button @click="cancelEdit" size="large">取消</el-button>
        </el-row>
        <el-drawer v-model="showAdd" direction="rtl">
        <el-drawer v-model="showAdd" direction="rtl" @close="colseDrawer">
            <template #title>
                <h4>新增审批流</h4>
            </template>
@@ -122,25 +122,23 @@
            })
            const ruleFormRef = ref<FormInstance>()
            const ProgressRules = reactive<FormRules>({
                department: [{required:true,message: '该选项不能为空'}],
                manager: [{required:true,message: '该选项不能为空'}]
                department: [{required:true,message: '该选项不能为空',trigger: 'blur'}],
                manager: [{required:true,message: '该选项不能为空',trigger: 'blur'}]
            })
            const confirmClick = async (formEl: FormInstance | undefined) => {
                if (!formEl) return
                await formEl.validate((valid, fields) => {
                    if (valid) {
                        approveSteps.splice(chosenIndex.value+1,0,addProgress.value)
                        addProgress.value = {
                            department: '',
                            manager: '',
                            others: ''
                        }
                        showAdd.value = false
                    } else {
                        console.log('error submit!', fields)
                    }
                })

            }
            const cancelClick=()=>{
                showAdd.value = false
            }
            const addFlow = (index) => {
                showAdd.value = true
@@ -161,6 +159,13 @@
                const i = chosenIndex.value
                approveSteps.splice( i,1)
                deleteDialog.value = false
            }
            const colseDrawer = ()=>{
                addProgress.value = {
                    department: '',
                    manager: '',
                    others: ''
                }
            }
            const cancelEdit = () => {

@@ -184,7 +189,9 @@
                ProgressRules,
                chosenIndex,
                deleteDialog,
                colseDrawer,
                conFirmDelete,
                cancelClick,
                deleteFlow,
                addFlow,
                confirmClick,

 src/views/specialWorkSystem/approvalProcess/reportTypeSetting/index.vue

@@ -6,23 +6,23 @@
        </el-row>
        <el-row>
            <el-table :data="tableData" border style="width: 100%">
                <el-table-column prop="id" label="标识" width="180" />
                <el-table-column type="index" label="标识" width="100"/>
                <el-table-column prop="type" label="上报数据类型名称" width="180" />
                <el-table-column prop="founder" label="创建人"/>
                <el-table-column prop="createTime" label="创建时间" width="180" />
                <el-table-column prop="editor" label="最新编辑人" width="180" />
                <el-table-column prop="editorTime" label="最新编辑时间" />
                <el-table-column prop="editeTime" label="最新编辑时间" />
                <el-table-column fixed="right" label="操作" width="180">
                    <template #default>
                        <el-button link type="primary" size="small">编辑</el-button>
                        <el-button link type="danger" size="small">删除</el-button>
                    <template #default="scope">
                        <el-button link type="primary" size="small" @click="editeRow(scope.$index,scope.row)">编辑</el-button>
                        <el-button link type="danger" size="small" @click="deleteRow(scope.$index)">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </el-row>
        <el-dialog v-model="dialogAddForm" title="新建上报类型">
            <el-form :model="reportForm" label-width="120px">
                <el-form-item label="上报数据类型">
        <el-dialog v-model="dialogAddForm" title="新建上报类型" @close="dialogColse">
            <el-form :model="reportForm" label-width="120px" ref="ruleFormRef" :rules="addRules">
                <el-form-item label="上报数据类型" prop="type">
                    <el-select v-model="reportForm.type" placeholder="选择上报数据类型">
                        <el-option label="上报审批意见" value="上报审批意见" />
                        <el-option label="上报气体监测数据" value="上报气体监测数据" />
@@ -30,17 +30,17 @@
                    </el-select>
                </el-form-item>
                <el-form-item label="创建人">
                    <el-select v-model="reportForm.founder" placeholder="选择创建人">
                    <el-select v-model="reportForm.founder" property="founder" placeholder="选择创建人">
                        <el-option label="创建人1" value="创建人1" />
                        <el-option label="创建人2" value="创建人2" />
                    </el-select>
                </el-form-item>
                <el-form-item label="最新编辑人">
                <el-form-item label="最新编辑人" prop="editor">
                    <el-input v-model="reportForm.editor" />
                </el-form-item>
                <el-form-item>
                    <el-button type="primary" @click="onSubmitAddForm" size="default">确认</el-button>
                    <el-button size="default">取消</el-button>
                    <el-button type="primary" @click="onSubmitAddForm(ruleFormRef)" size="default">确认</el-button>
                    <el-button size="default" @click="dialogAddForm = false">取消</el-button>
                </el-form-item>
            </el-form>
        </el-dialog>
@@ -54,7 +54,7 @@
    import { initBackEndControlRoutes } from '/@/router/backEnd';
    import {useUserInfo} from "/@/stores/userInfo";
    import { Session } from '/@/utils/storage';
    import { ElMessage } from 'element-plus'
    import { FormInstance, FormRules } from 'element-plus'
    let global: any = {
        homeChartOne: null,
        homeChartTwo: null,
@@ -68,52 +68,93 @@
    interface type {

    }
    interface User {
        type: string,
        founder: string,
        editor: string
    }
    export default defineComponent({
        name: 'reportTypeSetting',
        setup() {
            const userInfo = useUserInfo()
            const { userInfos } = storeToRefs(userInfo);
            const state  = reactive<stateType>({});
            const tableData = [
            const tableData =reactive([
                {
                    id: '0',
                    type: '上报审批意见',
                    founder: '',
                    createTime: '',
                    editor: '',
                    editorTime: ''
                    editeTime: ''
                },
                {
                    id: '1',
                    type: '上报气体检测数据',
                    founder: '',
                    createTime: '',
                    editor: '',
                    editorTime: ''
                    editeTime: ''
                },
                {
                    id: '2',
                    type: '上报安全措施确认',
                    founder: '',
                    createTime: '',
                    editor: '',
                    editorTime: ''
                    editeTime: ''
                }
            ];
            ])
            const dialogAddForm = ref(false);
            const reportForm = reactive({
                id: '',
            const rowIndex = ref(-1)
            const reportForm = ref({
                type: '',
                founder: '',
                createTime: '',
                editor: '',
                editorTime: ''
                editeTime: ''
            })
            const addReport = ()=>{
                dialogAddForm.value = true
            };
            const onSubmitAddForm = () => {
                console.log('submit!')
            const ruleFormRef = ref<FormInstance>()
            const addRules = reactive<FormRules>({
                type:[{required: true, message: '该内容不能为空',trigger:'blur'}],
                founder:[{required: true, message: '该内容不能为空',trigger:'blur'}],
                editor:[{required: true, message: '该内容不能为空',trigger:'blur'}]
            })
            const onSubmitAddForm = async (formEl: FormInstance | undefined) => {
                if (!formEl) return
                await formEl.validate((valid, fields) => {
                    if (valid) {
                        if(rowIndex.value == -1){
                            reportForm.value.createTime = new Date().toLocaleString()
                            reportForm.value.editeTime = new Date().toLocaleString()
                            tableData.push(reportForm.value)
                        }else{
                            tableData[rowIndex.value] = reportForm.value
                        }
                        dialogAddForm.value = false
                    } else {
                        console.log('error submit!', fields)
                    }
                })
            }
            const editeRow = (index: number, row: User) =>{
                dialogAddForm.value = true
                rowIndex.value = index
                reportForm.value = JSON.parse(JSON.stringify(row))
                reportForm.value.editeTime = new Date().toLocaleString()
            }
            const deleteRow = (index)=>{
                tableData.splice( index,1)
            }
            const dialogColse = () =>{
                reportForm.value = {
                    type: '',
                    founder: '',
                    createTime: '',
                    editor: '',
                    editeTime: ''
                }
                rowIndex.value = -1
            }
            // 折线图
            const renderMenu = async (value: string) => {
@@ -126,6 +167,11 @@
                tableData,
                dialogAddForm,
                reportForm,
                ruleFormRef,
                addRules,
                dialogColse,
                editeRow,
                deleteRow,
                addReport,
                onSubmitAddForm,
                ...toRefs(state),