Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

Your Name

2022-09-28 1cc2bba0c5cfd27e0744f1df8c5bbd41135ae817

 src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue

@@ -14,6 +14,13 @@
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="24" style="margin-bottom: 24px" v-if="approveLevelForm.type === 2">
                    <el-form-item label="审批类型" prop="auditType">
                        <el-select v-model="approveLevelForm.auditType" placeholder="请选择审批类型" class="input-add">
                            <el-option v-for="item in auditTypeList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="24" style="margin-bottom: 24px">
                    <el-form-item label="审批人" prop="unitList">
                        <el-select v-model="approveLevelForm.unitList" multiple placeholder="请选择审批人" class="input-add">
@@ -34,7 +41,7 @@
                </el-col>
                <div class="checkUnit-point">
                    <el-tabs class="active" v-model="activeName">
                        <el-tab-pane label="审批流程息" name="ApproveAction">
                        <el-tab-pane label="审批流程" name="ApproveAction">
                            <div class="filter-container">
                                <el-button size="default" type="primary" @click="openApproveActionDialog('新增', '', 0)">
                                    <el-icon>
@@ -104,6 +111,8 @@
    userList: [];
    timeList: Array<type>;
    typeList: Array<type>;
    auditTypeList: Array<type>;
    approveTypeList: Array<type>;
    workLevelList: [];
    standardList: Array<stand>;
    actionList: Array<action>;
@@ -121,6 +130,7 @@
    stepName: null;
    stepSerial: number | null;
    type: number | null;
    auditType: number | null;
    continueTime: number | null;
    continueTimeUnit: number | null;
    unitList: Array<personType>;
@@ -149,6 +159,7 @@
                stepName: null,
                stepSerial: null,
                type: null,
                auditType: null,
                continueTime: null,
                continueTimeUnit: null,
                unitList: [],
@@ -157,6 +168,7 @@
            approveLevelFormRule: {
                stepName: [{ required: true, message: '请填写层次名称', trigger: 'blur' }],
                type: [{ required: true, message: '请选择审批层级', trigger: 'change' }],
                auditType: [{ required: true, message: '请选择审批类型', trigger: 'change' }],
                unitList: [{ required: true, message: '请选择审批人', trigger: 'change' }],
                continueTime: [{ required: true, message: '请填写有效时间', trigger: 'blur' }]
            },
@@ -171,6 +183,15 @@
                { id: 1, name: '单人' },
                { id: 2, name: '多人' },
                { id: 3, name: '分析人' }
            ],
            auditTypeList: [
                { id: 0, name: '单审' },
                { id: 1, name: '会审' },
            ],
            approveTypeList: [
                { id: 1, name: '数值' },
                { id: 2, name: '选项' },
                { id: 3, name: '填空' }
            ],
            workLevelList: [],
            actionList: [],
@@ -190,6 +211,7 @@
                    stepName: null,
                    stepSerial: null,
                    type: null,
                    auditType: null,
                    continueTime: null,
                    continueTimeUnit: null,
                    unitList: [],
@@ -274,7 +296,7 @@

        const parseNumber = (value: number, type: string) => {
            if (type === '审批项类型') {
                return data.typeList.find((item) => item.id === value)?.name;
                return data.approveTypeList.find((item) => item.id === value)?.name;
            } else if (type === '措施名称') {
                return data.actionList.find((item) => item.id === value)?.context;
            } else {