lct

Your Name

2023-03-13 c3eaa06e9ee77c4c94138a8638648be0755efae3

lct

 .env.development

@@ -1,13 +1,13 @@
# 本地环境
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.38:8008'
#VITE_API_URL = 'http://192.168.0.38:8008'
#黄振接口地址

#VITE_API_URL = 'http://192.168.0.179:8008'
@@ -27,7 +27,6 @@

#VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out'
#本地外包预发接口地址


VITE_API_URL_OUT = 'http://192.168.0.50:8009'
#张凤外包接口地址

 .idea/shelf/Uncommitted_changes_before_Update_at_2023_3_3_13_33_[Default_Changelist]/shelved.patch

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2023_3_3_13_33__Default_Changelist_.xml

文件已删除

 src/views/facilityManagement/goodsDetailManage/components/goodsDetailAdd.vue

@@ -187,7 +187,8 @@
        endRfid:  null ,
        wareHousingCount:  null,
    };
    goodsDetailAddState.classifyList = goodsDetailAddState.departmentList.find(item => item.depId === userInfo.userInfos.depId)?.classificationList as Array<ClassificationListType>
    goodsDetailAddState.classifyList = goodsDetailAddState.departmentList.find(item => item.depId === userInfo.userInfos.depId)
        ?.classificationList as Array<ClassificationListType>
}

// const changeDepartment = (value: number | null) => {

 src/views/facilityManagement/goodsDetailManage/components/goodsDetailEdit.vue

@@ -150,8 +150,6 @@
            goodsDetailEditState.goodsDetailForm[i] = value[i];
        }
    }
    debugger

}

const changeDepartment = (value: number | null) => {

 src/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue

@@ -106,12 +106,12 @@
            personType: null,
        });

        const showApproveItemDialog = (type: string, value: {}, index: number, approveLevelForm: { type: number }, standardList: [], actionList: []) => {
        const showApproveItemDialog = (type: string, value: {}, index: number, approveLevelForm: { personType: number }, standardList: [], actionList: []) => {
            data.approveItemDialog = true;
            data.standardList = standardList;
            data.actionList = actionList;
            data.order = index;
            if (approveLevelForm.type === 3) {
            if (approveLevelForm.personType === 3) {
                data.personType = 3
                data.typeList = [
                    { id: 1, name: '数值' },

 src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue

@@ -8,16 +8,30 @@
                    </el-form-item>
                </el-col>
                <el-col :span="24" style="margin-bottom: 24px">
                    <el-form-item label="审批层级" prop="type">
                        <el-select v-model="approveLevelForm.type" placeholder="请选择审批层级" class="input-add">
                    <el-form-item label="审批层级" prop="approvalType">
                        <el-select v-model="approveLevelForm.approvalType" placeholder="请选择审批层级" class="input-add">
                            <el-option v-for="item in typeList" :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" v-if="approveLevelForm.type === 2">
                <el-col :span="24" style="margin-bottom: 24px">
                    <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="personType">
                        <el-select v-model="approveLevelForm.personType" placeholder="请选择审批类型" class="input-add">
                            <el-option v-for="item in personTypeList" :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="contentType">
                        <el-select v-model="approveLevelForm.contentType" placeholder="请选择审批类型" class="input-add">
                            <el-option v-for="item in contentTypeList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                        </el-select>
                    </el-form-item>
                </el-col>
@@ -28,8 +42,8 @@
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="24" style="margin-bottom: 20px">
                    <el-form-item label="审批有效时间" prop="continueTime">
                <el-col :span="24" style="margin-bottom: 20px" v-if="approveLevelForm.personType === 3">
                    <el-form-item label="分析有效时间" prop="continueTime">
                        <el-input type="number" v-model="approveLevelForm.continueTime" placeholder="请输入审批有效时间" class="input-add">
                            <template #prepend>
                                <el-select v-model="approveLevelForm.continueTimeUnit" placeholder="选择单位">
@@ -113,6 +127,8 @@
    typeList: Array<type>;
    auditTypeList: Array<type>;
    approveTypeList: Array<type>;
    personTypeList: Array<type>;
    contentTypeList: Array<type>;
    workLevelList: [];
    standardList: Array<stand>;
    actionList: Array<action>;
@@ -129,8 +145,10 @@
    id: number | null;
    stepName: null;
    stepSerial: number | null;
    type: number | null;
    approvalType: number | null;
    auditType: number | null;
    contentType: number | null;
    personType: number | null;
    continueTime: number | null;
    continueTimeUnit: number | null;
    unitList: Array<personType>;
@@ -158,8 +176,10 @@
                id: null,
                stepName: null,
                stepSerial: null,
                type: null,
                approvalType: null,
                auditType: null,
                personType: null,
                contentType: null,
                continueTime: null,
                continueTimeUnit: null,
                unitList: [],
@@ -167,8 +187,10 @@
            },
            approveLevelFormRule: {
                stepName: [{ required: true, message: '请填写层次名称', trigger: 'blur' }],
                type: [{ required: true, message: '请选择审批层级', trigger: 'change' }],
                approvalType: [{ required: true, message: '请选择审批层级', trigger: 'change' }],
                auditType: [{ required: true, message: '请选择审批类型', trigger: 'change' }],
                personType: [{ required: true, message: '请选择人员类型', trigger: 'change' }],
                contentType: [{ required: true, message: '请选择内容类型', trigger: 'change' }],
                unitList: [{ required: true, message: '请选择审批人', trigger: 'change' }],
                continueTime: [{ required: true, message: '请填写有效时间', trigger: 'blur' }]
            },
@@ -182,11 +204,20 @@
            typeList: [
                { id: 1, name: '单人' },
                { id: 2, name: '多人' },
                { id: 3, name: '分析人' }
                // { id: 3, name: '分析人' }
            ],
            auditTypeList: [
                { id: 1, name: '单审' },
                { id: 2, name: '会审' },
            ],
            personTypeList: [
                { id: 1, name: '普通人员审批' },
                { id: 2, name: '监护人员元审批' },
                { id: 3, name: '分析人员审批' }
            ],
            contentTypeList: [
                { id: 1, name: '审批项审批' },
                { id: 2, name: '简单审批' },
            ],
            approveTypeList: [
                { id: 1, name: '数值' },
@@ -210,8 +241,10 @@
                    id: null,
                    stepName: null,
                    stepSerial: null,
                    type: null,
                    approvalType: null,
                    auditType: null,
                    personType: null,
                    contentType: null,
                    continueTime: null,
                    continueTimeUnit: null,
                    unitList: [],