Your Name
2022-09-28 0dac7ba33f77342d2a9a1392c820d10d3b72d76c
'修改'
已修改6个文件
45 ■■■■ 文件已修改
.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.ts 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/specialWorkSystem/workTicket/allApplys/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/specialWorkSystem/workTicket/myApproval/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/specialWorkSystem/workTicket/myJobApply/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -1,10 +1,10 @@
# 本地环境
ENV = 'development'
#VITE_API_URL = 'http://192.168.0.35:8008'
VITE_API_URL = 'http://192.168.0.35:8008'
#李宇飞接口地址
VITE_API_URL = 'http://192.168.0.50:8008'
#VITE_API_URL = 'http://192.168.0.50:8008'
#张凤接口地址
#VITE_API_URL = 'http://192.168.0.29:8008'
src/utils/request.ts
@@ -66,12 +66,12 @@
        } else if (response.data.code && response.data.code === 'A0215') {
            ElMessage.error('token失效');
            // logOut;
            // useLoginApi()
            //     .signOut()
            //     .then(() => {
            //         Session.clear();
            //         window.location.href = '/';
            //     });
            useLoginApi()
                .signOut()
                .then(() => {
                    Session.clear();
                    window.location.href = '/';
                });
        }
        // if(response.data.code && response.data.code !== '200'){
        return Promise.resolve(response);
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">
@@ -104,6 +111,7 @@
    userList: [];
    timeList: Array<type>;
    typeList: Array<type>;
    auditTypeList: Array<type>;
    approveTypeList: Array<type>;
    workLevelList: [];
    standardList: Array<stand>;
@@ -122,6 +130,7 @@
    stepName: null;
    stepSerial: number | null;
    type: number | null;
    auditType: number | null;
    continueTime: number | null;
    continueTimeUnit: number | null;
    unitList: Array<personType>;
@@ -150,6 +159,7 @@
                stepName: null,
                stepSerial: null,
                type: null,
                auditType: null,
                continueTime: null,
                continueTimeUnit: null,
                unitList: [],
@@ -158,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' }]
            },
@@ -172,6 +183,10 @@
                { id: 1, name: '单人' },
                { id: 2, name: '多人' },
                { id: 3, name: '分析人' }
            ],
            auditTypeList: [
                { id: 0, name: '单审' },
                { id: 1, name: '会审' },
            ],
            approveTypeList: [
                { id: 1, name: '数值' },
@@ -196,6 +211,7 @@
                    stepName: null,
                    stepSerial: null,
                    type: null,
                    auditType: null,
                    continueTime: null,
                    continueTimeUnit: null,
                    unitList: [],
src/views/specialWorkSystem/workTicket/allApplys/index.vue
@@ -109,7 +109,10 @@
                                        审批结果:<span>{{ item.approvalResultDesc }}</span>
                                    </div>
                                    <div class="text">
                                        审批类型:<span>{{ item.typeDesc }}</span>
                                        审批层级:<span>{{ item.typeDesc }}</span>
                                    </div>
                                    <div class="text" v-if="item.auditTypeDesc">
                                        审批类型:<span>{{ item.auditTypeDesc }}</span>
                                    </div>
                                    <div class="text" v-show="item.startApprovalTime != null">
                                        开始时间:<span>{{ item.startApprovalTime }}</span>
src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -88,7 +88,10 @@
                                        审批结果:<span>{{ item.approvalResultDesc }}</span>
                                    </div>
                                    <div class="text">
                                        审批类型:<span>{{ item.typeDesc }}</span>
                                        审批层级:<span>{{ item.typeDesc }}</span>
                                    </div>
                                    <div class="text" v-if="item.auditTypeDesc">
                                        审批类型:<span>{{ item.auditTypeDesc }}</span>
                                    </div>
                                    <div class="text" v-show="item.startApprovalTime != null">
                                        开始时间:<span>{{ item.startApprovalTime }}</span>
src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -92,6 +92,9 @@
                                    <div class="text">
                                        审批类型:<span>{{ item.typeDesc }}</span>
                                    </div>
                                    <div class="text" v-if="item.auditTypeDesc">
                                        审批类型:<span>{{ item.auditTypeDesc }}</span>
                                    </div>
                                    <div class="text" v-show="item.startApprovalTime != null">
                                        开始时间:<span>{{ item.startApprovalTime }}</span>
                                    </div>