From 29a021ddfc98b26ddcde415809e9f604699ce0bd Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 04 七月 2025 13:06:14 +0800 Subject: [PATCH] 修改 --- src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue | 130 +++++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 78 deletions(-) diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue index 0fd20cc..3c21c55 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue @@ -11,26 +11,14 @@ <el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" > <el-row :gutter="24"> <el-col :span="24"> - <el-form-item label="企业名称:" prop="companyName" v-if="state.isAdmin"> - <el-select - v-model="state.form.companyName" - filterable - remote - :disabled="title == '查看' || !state.isAdmin" - @change="selectValueCom" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - style="width: 100%" - - > + <el-form-item label="企业名称:" prop="companyId" v-if="state.isAdmin"> + <el-select v-model="state.form.companyId" placeholder="请选择" clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin" @change="selectValueCom"> <el-option v-for="item in state.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> </el-form-item> </el-col> @@ -39,7 +27,7 @@ <el-col :span="24"> <el-form-item label="质量目标:" prop="qualityId" > <el-select - :disabled="title === '查看'" + :disabled="title === '查看' || title == '编辑'" v-model="state.form.qualityId" placeholder="请选择质量目标" style="width: 100%" @@ -120,24 +108,13 @@ </el-row> <el-row :gutter="24"> <el-col :span="12"> - <el-form-item label="拟制:" prop="fictionName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.fictionName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item label="拟制:" prop="fictionId" > + <el-select clearable v-model="state.form.fictionId" :disabled="title =='查看'" filterable style="width: 100%"> <el-option v-for="item in state.peopleList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -155,24 +132,13 @@ </el-row> <el-row :gutter="24" > <el-col :span="12"> - <el-form-item label="审核:" prop="checkName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.checkName" - filterable - remote - @change="selectValue1" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item label="审核:" prop="checkId" > + <el-select clearable v-model="state.form.checkId" :disabled="title =='查看'" filterable style="width: 100%"> <el-option v-for="item in state.peopleList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -190,24 +156,13 @@ </el-row> <el-row :gutter="24"> <el-col :span="12"> - <el-form-item label="批准:" prop="ratifyName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.ratifyName" - filterable - remote - @change="selectValue2" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item label="批准:" prop="ratifyId" > + <el-select clearable v-model="state.form.ratifyId" :disabled="title =='查看'" filterable style="width: 100%"> <el-option v-for="item in state.peopleList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -266,13 +221,13 @@ qualityTargets:[], }, rules: { - companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }], + companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], qualityId: [{ required: true, message: '请选择质量目标', trigger: 'blur' }], number: [{ required: true, message: '请输入编号', trigger: 'blur' }], serial: [{ required: true, message: '请输入序号', trigger: 'blur' }], - fictionName: [{ required: true, message: '请选择拟制', trigger: 'blur' }], - ratifyName: [{ required: true, message: '请选择批准人', trigger: 'blur' }], - checkName: [{ required: true, message: '请选择审核人', trigger: 'blur' }], + fictionId: [{ required: true, message: '请选择拟制', trigger: 'blur' }], + ratifyId: [{ required: true, message: '请选择批准人', trigger: 'blur' }], + checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }], checkTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], ratifyTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], fictionTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], @@ -294,7 +249,7 @@ }); -const openDialog = async (type, value) => { +const openDialog = async (type, value,companyList) => { const userInfo = JSON.parse(Cookies.get('userInfo')) state.isAdmin = userInfo.userType === 0; state.form.companyName = userInfo.companyName @@ -302,6 +257,7 @@ if(state.isAdmin){ state.form.companyId = value.companyId state.form.companyName = value.companyName + state.companyList = companyList } await getQualityList() title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ; @@ -312,6 +268,7 @@ state.form.companyName = value.companyName } } + await getPeopleList() dialogVisible.value = true; } @@ -402,20 +359,19 @@ state.companyList = [] state.qualityList = [] } -const getPeopleList = async (val)=>{ - if(val != ""){ - const queryParams = { - name: val - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getPeopleList = async ()=> { + const queryParams = { + pageNum: 1, + pageSize: 9999, + companyId: state.form.companyId } -} + const res = await getUser(queryParams) + if(res.code == 200){ + state.peopleList = res.data.list?res.data.list:[] + }else{ + ElMessage.warning(res.message) + } +}; const selectValue = (val) => { state.peopleList.forEach(item => { if(item.name === val){ @@ -458,15 +414,22 @@ state.form.qualityId = null state.qualityList = [] state.form.qualityTargets = [] + state.form.fictionId = null + state.form.fictionName = '' + state.form.checkId = null + state.form.checkName = '' + state.form.ratifyId = null + state.form.ratifyName = '' state.companyList.forEach(item => { if(item.name === val){ state.form.companyId = item.id } }) getQualityList() + getPeopleList() } const getCompanyList = async (val)=>{ - if(val != ""){ + if(val){ const queryParams = { name: val } @@ -477,6 +440,17 @@ } else { ElMessage.warning(res.message) } + }else { + const queryParams = { + pageSize: 999, + pageNum: 1, + } + const res = await getCompany(queryParams) + if (res.code == 200) { + state.companyList = res.data.list + } else { + ElMessage.warning(res.message) + } } } defineExpose({ -- Gitblit v1.9.2