From dcddf912c4262bb129ed8d131bedb8fdace1c51d Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期五, 04 七月 2025 11:13:55 +0800 Subject: [PATCH] 修改 --- src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue | 148 +----- src/views/build/conpanyFunctionConsult/companyInfo/overview/components/overviewDialog.vue | 50 -- src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue | 107 +++-- src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue | 68 -- src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue | 58 -- src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue | 88 +--- src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue | 58 -- src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue | 180 +++---- src/views/build/conpanyFunctionConsult/companyInfo/policy/components/policyDialog.vue | 56 -- src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue | 80 +-- src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue | 66 -- src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue | 58 -- src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/components/basicInfoDialog.vue | 57 -- src/views/build/conpanyFunctionConsult/companyInfo/qualifications/components/qualificationsDialog.vue | 27 src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue | 125 +---- 15 files changed, 366 insertions(+), 860 deletions(-) diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/components/basicInfoDialog.vue b/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/components/basicInfoDialog.vue index fd4945d..540115d 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/components/basicInfoDialog.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/components/basicInfoDialog.vue @@ -9,25 +9,14 @@ :close-on-click-modal="false" > <el-form :model="state.form" size="default" ref="busRef" :rules="state.formRules" label-position="top" label-width="150px" > - <el-form-item label="企业名称:" prop="companyName" v-if="state.isAdmin"> - <el-select - v-model="state.form.companyName" - filterable - remote - :disabled="title == '查看' || title == '编辑' || !state.isAdmin" - @change="selectValue" - 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"> <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-form-item label="1.企业的基本情况,主要包括:法人证书编号,所属部门、法人代表姓名、身份证号、职务、人员总数、技术人员数、不良情况记录、保密等资质。" prop="basic" > @@ -112,13 +101,13 @@ onMounted(() => { }) -const openDialog = async (type, value) => { +const openDialog = async (type, value,companyList) => { const userInfo = JSON.parse(Cookies.get('userInfo')) state.isAdmin = userInfo.userType === 0; if(state.isAdmin){ - await getCompanyList() + state.companyList = companyList } title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ; if(type === 'edit' || type === 'review') { @@ -195,40 +184,6 @@ } state.companyList = [] -} -const selectValue = (val) => { - state.companyList.forEach(item => { - if(item.name === val){ - state.form.companyId = item.id - } - }) -} -const getCompanyList = async (val)=>{ - if(val){ - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else { - - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - } } defineExpose({ openDialog diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue index bc91cd0..86358b4 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/basicInfo/index.vue @@ -11,24 +11,13 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.queryParams.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> </el-form-item> <el-form-item v-if="data.isAdmin"> @@ -134,7 +123,7 @@ getList(); } const openDialog = (type, value) => { - noticeRef.value.openDialog(type, value); + noticeRef.value.openDialog(type, value,data.companyList); } const selectValue = (val) => { data.companyList.forEach(item => { @@ -144,34 +133,17 @@ }) } -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else { - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/overview/components/overviewDialog.vue b/src/views/build/conpanyFunctionConsult/companyInfo/overview/components/overviewDialog.vue index 1bf316c..d13883e 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/overview/components/overviewDialog.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/overview/components/overviewDialog.vue @@ -7,25 +7,15 @@ :before-close="handleClose" > <el-form :model="state.noticeForm" size="default" ref="noticeRef" :rules="title === '新增' || title === '编辑' ? state.formRules : {}" label-width="110px" > - <el-form-item label="企业名称:" prop="companyName" v-if="state.isAdmin"> - <el-select - v-model="state.noticeForm.companyName" - filterable - remote - :disabled="title == '查看' || title == '编辑' || !state.isAdmin" - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - style="width: 100%" - > + <el-form-item v-if="state.isAdmin" label="企业:" prop="companyId"> + <el-select v-model="state.noticeForm.companyId" placeholder="请选择" clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin"> <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-form-item label="企业概括:" v-if="showEditor" required> @@ -80,7 +70,7 @@ companyName: '' }, formRules:{ - companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }], + companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], companySummary: [{ required: true, message: '企业概况', trigger: 'blur' }], }, isAdmin: false, @@ -90,12 +80,12 @@ onMounted(() => { }); -const openDialog = async (type, value) => { +const openDialog = async (type, value,companyList) => { const userInfo = JSON.parse(Cookies.get('userInfo')) state.isAdmin = userInfo.userType === 0; if(state.isAdmin){ - await getCompanyList() + state.companyList = companyList } isReview.value = false; showEditor.value = false @@ -158,31 +148,7 @@ }) } } -const getCompanyList = async (val)=>{ - if(val){ - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - }else { - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - } -} const onSubmit = async () => { state.noticeForm.companySummary = tinyMCE.activeEditor.getContent(); diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue index 5fe7b70..70058b7 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/overview/index.vue @@ -11,25 +11,33 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> +<!-- <el-select--> +<!-- v-model="data.companyName"--> +<!-- filterable--> +<!-- remote--> +<!-- @change="selectValue"--> +<!-- reserve-keyword--> +<!-- placeholder="请输入企业名称"--> +<!-- remote-show-suffix--> +<!-- :remote-method="getCompanyList"--> +<!-- :loading="loadingCompany"--> +<!-- style="width: 240px"--> +<!-- >--> +<!-- <el-option--> +<!-- v-for="item in data.companyList"--> +<!-- :key="item.id"--> +<!-- :label="item.name"--> +<!-- :value="item.name"--> +<!-- />--> +<!-- </el-select>--> </el-form-item> <el-form-item v-if="data.isAdmin"> <el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button> @@ -124,7 +132,7 @@ getList(); } const openDialog = (type, value) => { - noticeRef.value.openDialog(type, value); + noticeRef.value.openDialog(type, value,data.companyList); } const selectValue = (val) => { data.companyList.forEach(item => { @@ -134,36 +142,49 @@ }) } -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else{ - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } +// const getCompanyList = async (val)=>{ +// if(val){ +// loadingCompany.value = true; +// const queryParams = { +// name: val +// } +// const res = await getCompany(queryParams) +// if (res.code == 200) { +// loadingCompany.value = false; +// data.companyList = res.data.list +// +// } else { +// ElMessage.warning(res.message) +// } +// }else{ +// loadingCompany.value = true; +// const queryParams = { +// pageSize: 999, +// pageNum: 1, +// } +// const res = await getCompany(queryParams) +// if (res.code == 200) { +// loadingCompany.value = false; +// data.companyList = res.data.list +// +// } else { +// ElMessage.warning(res.message) +// } +// } +// } const handleSizeChange = (val) => { data.queryParams.pageSize = val diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/policy/components/policyDialog.vue b/src/views/build/conpanyFunctionConsult/companyInfo/policy/components/policyDialog.vue index 95a53d2..efc33e2 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/policy/components/policyDialog.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/policy/components/policyDialog.vue @@ -7,25 +7,14 @@ :before-close="handleClose" > <el-form :model="state.noticeForm" size="default" ref="noticeRef" :rules="title === '新增' || title === '编辑' ? state.formRules : {}" label-width="110px" > - <el-form-item label="企业名称:" prop="companyName" v-if="state.isAdmin"> - <el-select - v-model="state.noticeForm.companyName" - filterable - remote - :disabled="title == '查看' || title == '编辑' ||!state.isAdmin" - @change="selectValue" - 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.noticeForm.companyId" placeholder="请选择" clearable style="width: 100%" :disabled="title == '查看' || title == '编辑' || !state.isAdmin"> <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-form-item label="质量方针:" v-if="showEditor" required> @@ -81,7 +70,7 @@ companyName: '' }, formRules:{ - companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }], + companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], policy: [{ required: true, message: '质量方针', trigger: 'blur' }], }, isAdmin: false, @@ -92,11 +81,11 @@ onMounted(() => { }); -const openDialog = async (type, value) => { +const openDialog = async (type, value,companyList) => { const userInfo = JSON.parse(Cookies.get('userInfo')) state.isAdmin = userInfo.userType === 0; if(state.isAdmin){ - await getCompanyList() + state.companyList = companyList } isReview.value = false; showEditor.value = false @@ -233,38 +222,7 @@ companyName: '' } } -const selectValue = (val) => { - state.companyList.forEach(item => { - if(item.name === val){ - state.noticeForm.companyId = item.id - } - }) -} -const getCompanyList = async (val)=>{ - if(val){ - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - }else { - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - } -} defineExpose({ openDialog diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue index a15dcf3..a9ae427 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/policy/index.vue @@ -11,24 +11,13 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> </el-form-item> <el-form-item v-if="data.isAdmin"> @@ -125,44 +114,19 @@ getList(); } const openDialog = (type, value) => { - noticeRef.value.openDialog(type, value); + noticeRef.value.openDialog(type, value,data.companyList); } -const selectValue = (val) => { - data.companyList.forEach(item => { - if(item.name === val){ - data.queryParams.companyId = item.id - } - }) -} - -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else{ - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/components/qualificationsDialog.vue b/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/components/qualificationsDialog.vue index 479a0cf..d4810a8 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/components/qualificationsDialog.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/components/qualificationsDialog.vue @@ -9,25 +9,14 @@ :close-on-click-modal="false" > <el-form :model="state.form" size="default" ref="busRef" :rules="state.formRules" label-width="150px" > - <el-form-item label="企业名称:" prop="companyName" v-if="state.isAdmin"> - <el-select - v-model="state.form.companyName" - filterable - remote - :disabled="title == '查看' || title == '编辑' || !state.isAdmin" - @change="selectValue" - 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"> <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-form-item label="取得资质证书名称:" prop="certificateName" > @@ -106,7 +95,7 @@ fileName: '' }, formRules:{ - companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }], + companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], certificateName:[{ required: true, message: '请输入取得资质证书名称', trigger: 'blur' }], certificateNum:[{ required: true, message: '请输入证书编号', trigger: 'blur' }], effectiveTime:[{ required: true, message: '请选择截止日期', trigger: 'blur' }], @@ -122,11 +111,11 @@ }) -const openDialog = async (type, value) => { +const openDialog = async (type, value,companyList) => { const userInfo = JSON.parse(Cookies.get('userInfo')) state.isAdmin = userInfo.userType === 0; if(state.isAdmin){ - await getCompanyList() + state.companyList = companyList } title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ; if(type === 'edit' || type === 'review') { @@ -269,7 +258,7 @@ } }else{ const queryParams = { - pageSize: 10, + pageSize: 999, pageNum: 1, } const res = await getCompany(queryParams) diff --git a/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue b/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue index 3c69f8f..fa1c55b 100644 --- a/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue +++ b/src/views/build/conpanyFunctionConsult/companyInfo/qualifications/index.vue @@ -11,24 +11,13 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.queryParams.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> </el-form-item> <el-form-item v-if="data.isAdmin"> @@ -147,47 +136,21 @@ getList(); } const openDialog = (type, value) => { - noticeRef.value.openDialog(type, value); + noticeRef.value.openDialog(type, value,data.companyList); } -const selectValue = (val) => { - data.companyList.forEach(item => { - if(item.name === val){ - data.queryParams.companyId = item.id - } - }) -} - -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else{ - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } - const handleSizeChange = (val) => { data.queryParams.pageSize = val getList() @@ -207,6 +170,7 @@ choosedData.value = [] data.companyList = []; getList(); + getCompanyList() } const exportData = () => { diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue index 7b51a39..b243918 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue @@ -11,25 +11,14 @@ <el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" label-width="120px" > <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 == '查看' || 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> @@ -143,24 +132,13 @@ </el-row> <el-row :gutter="24" v-if="state.form.type == 2"> <el-col :span="12"> - <el-form-item label="编制:" prop="compilationName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.compilationName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item label="编制:" prop="compilationId" > + <el-select clearable v-model="state.form.compilationId" :disabled="title =='查看'" filterable style="width: 100%"> <el-option - v-for="item in state.peopleList" + v-for="item in state.userList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -178,24 +156,13 @@ </el-row> <el-row :gutter="24" > <el-col :span="12"> - <el-form-item label="质量管理部:" prop="qualityName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.qualityName" - filterable - remote - @change="selectValue1" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item label="质量管理部:" prop="qualityId" > + <el-select clearable v-model="state.form.qualityId" :disabled="title =='查看'" filterable style="width: 100%"> <el-option - v-for="item in state.peopleList" + v-for="item in state.userList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -213,24 +180,13 @@ </el-row> <el-row :gutter="24"> <el-col :span="12"> - <el-form-item label="公司分管领导:" prop="leadName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.leadName" - filterable - remote - @change="selectValue2" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item label="公司分管领导:" prop="leadId" > + <el-select clearable v-model="state.form.leadId" :disabled="title =='查看'" filterable style="width: 100%"> <el-option - v-for="item in state.peopleList" + v-for="item in state.userList" :key="item.id" :label="item.name" - :value="item.name" + :value="item.id" /> </el-select> </el-form-item> @@ -263,6 +219,7 @@ import {ElMessage} from "element-plus"; import {getUser} from "@/api/onlineEducation/user"; import {addObjective, editObject, getDept} from "@/api/qualityObjectives/object"; +import {listUser} from "@/api/system/user"; const dialogVisible = ref(false); const title = ref(""); @@ -278,26 +235,26 @@ type: '', departId: '', method: '', - compilationBy:'', + compilationId:'', compilationTime:'', - qualityBy: '', + qualityId: '', qualityTime:'', - leadBy:'', + leadId:'', leadTime: '', qualityTargets:[], }, rules: { - companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }], + companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], year: [{ required: true, message: '请输入年份', trigger: 'blur' }], num: [{ required: true, message: '请输入序号', trigger: 'blur' }], type: [{ required: true, message: '请选择级别', trigger: 'blur' }], method: [{ required: true, message: '请输入目标测量方法', trigger: 'blur' }], - compilationName: [{ required: true, message: '请选择编制人员', trigger: 'blur' }], + compilationId: [{ required: true, message: '请选择编制人员', trigger: 'blur' }], compilationTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], - qualityName: [{ required: true, message: '请选择质量管理部人员', trigger: 'blur' }], + qualityId: [{ required: true, message: '请选择质量管理部人员', trigger: 'blur' }], qualityTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], - leadName: [{ required: true, message: '请选择公司分管领导', trigger: 'blur' }], + leadId: [{ required: true, message: '请选择公司分管领导', trigger: 'blur' }], leadTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], departId: [{ required: true, message: '请选择部门', trigger: 'blur' }], objName: [{required: true, message: "质量目标不能为空", trigger: "blur"}], @@ -340,23 +297,28 @@ ] }) -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 state.form.companyId = userInfo.companyId + if(state.isAdmin){ + state.companyList = companyList + state.form.companyId = null + } title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ; if(type === 'edit' || type === 'review') { state.form = JSON.parse(JSON.stringify(value)); + state.form.compilationBy = state.form.compilationId + state.form.leadBy = state.form.leadId + state.form.qualityBy = state.form.qualityId + if(state.isAdmin){ state.form.companyId = value.companyId state.form.companyName = value.companyName } } await getDeptList() - if(state.isAdmin){ - await getCompanyList() - } await getPeopleList() dialogVisible.value = true; } @@ -450,35 +412,47 @@ const handleDelete = (val) => { state.form.qualityTargets = state.form.qualityTargets.filter(item=> item != val) } -const getPeopleList = async (val)=>{ - if(val){ - const queryParams = { - name: val, - companyId: state.form.companyId == 0 ? null : state.form.companyId - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - } else { - ElMessage.warning(res.message) +const getPeopleList = async ()=> { + const queryParams = { + companyId: state.form.companyId } - }else { - const queryParams = { - pageNum: 1, - pageSize: 10, - companyId: state.form.companyId == 0 ? null : state.form.companyId - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - + const res = await getUser(queryParams) + if(res.code == 200){ + state.userList = res.data.list?res.data.list:[] + }else{ + ElMessage.warning(res.message) } -} +}; +// const getPeopleList = async (val)=>{ +// if(val){ +// const queryParams = { +// name: val, +// companyId: state.form.companyId == 0 ? null : state.form.companyId +// } +// const res = await getUser(queryParams) +// if (res.code == 200) { +// state.peopleList = res.data.list +// +// } else { +// ElMessage.warning(res.message) +// } +// }else { +// const queryParams = { +// pageNum: 1, +// pageSize: 10, +// companyId: state.form.companyId == 0 ? null : state.form.companyId +// } +// const res = await getUser(queryParams) +// if (res.code == 200) { +// state.peopleList = res.data.list +// +// } else { +// ElMessage.warning(res.message) +// } +// +// } +// } const selectValue = (val) => { state.peopleList.forEach(item => { if(item.name === val){ @@ -509,16 +483,16 @@ } } const selectValueCom = (val) => { - state.form.leadBy = null - state.form.qualityBy = null - state.form.compilationBy = null + state.form.leadId = null + state.form.qualityId = null + state.form.compilationId = null state.form.leadName = null state.form.qualityName = null state.form.compilationName = null state.form.departId = null state.companyList.forEach(item => { - if(item.name === val){ - state.form.companyId = item.id + if(item.id === val){ + state.form.companyName = item.name } }) getDeptList() @@ -542,7 +516,7 @@ } }else { const queryParams = { - pageSize: 10, + pageSize: 999, pageNum: 1, } const res = await getCompany(queryParams) diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue index 5c056b1..34053af 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/index.vue @@ -11,24 +11,13 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.queryParams.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> </el-form-item> <el-form-item label="年份:" style="margin-left: 20px"> @@ -219,7 +208,7 @@ getList(); } const openDialog = (type, value) => { - noticeRef.value.openDialog(type, value); + noticeRef.value.openDialog(type, value,data.companyList); } const selectValue = (val) => { data.companyList.forEach(item => { @@ -229,34 +218,17 @@ }) } -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else{ - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue index a7068e3..3be6577 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue @@ -11,26 +11,14 @@ <el-form :model="state.form" size="default" ref="busRef" :rules="state.rules" label-width="120" > <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 == '查看' || 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> @@ -109,24 +97,13 @@ </el-row> <el-row :gutter="24"> <el-col :span="12"> - <el-form-item :label="state.type == 1 ? '公司负责人:' : '部门负责人:'" prop="chargeName" > - <el-select - :disabled="title === '查看'" - v-model="state.form.chargeName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入人员名称" - remote-show-suffix - :remote-method="getPeopleList" - style="width: 240px" - > + <el-form-item :label="state.type == 1 ? '公司负责人:' : '部门负责人:'" prop="chargeId" > + <el-select clearable v-model="state.form.chargeId" :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> @@ -183,10 +160,10 @@ qualityTargets:[], }, rules: { - companyName: [{ required: true, message: '请选择企业', trigger: 'blur' }], + companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }], qualityId: [{ required: true, message: '请选择质量目标', trigger: 'blur' }], serial: [{ required: true, message: '请输入序号', trigger: 'blur' }], - chargeName: [{ required: true, message: '请选择负责人', trigger: 'blur' }], + chargeId: [{ required: true, message: '请选择负责人', trigger: 'blur' }], chargeTime: [{ required: true, message: '请选择日期', trigger: 'blur' }], accomplish:[{ required: true, message: '请输入质量目标完成情况', trigger: 'blur' }], frequency:[{ required: true, message: '请选择考核时机', trigger: 'blur' }], @@ -222,7 +199,7 @@ }); -const openDialog = async (type, isCom, value) => { +const openDialog = async (type, isCom, value,companyList) => { const userInfo = JSON.parse(Cookies.get('userInfo')) state.isAdmin = userInfo.userType === 0; @@ -232,6 +209,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' ? '编辑' : '查看' ; @@ -239,9 +217,7 @@ state.form = JSON.parse(JSON.stringify(value)); chooseQuality(state.form.qualityId) } - if(state.isAdmin){ - await getCompanyList() - } + await getPeopleList() dialogVisible.value = true; } @@ -332,35 +308,17 @@ state.companyList = [] state.qualityList = [] } -const getPeopleList = async (val)=>{ - if(val){ - const queryParams = { - companyId: state.form.companyId == 0 ? null : state.form.companyId, - name: val - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else { - const queryParams = { - pageNum: 1, - pageSize: 10, - companyId: state.form.companyId == 0 ? null : state.form.companyId - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - +const getPeopleList = async ()=> { + const queryParams = { + 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){ @@ -413,7 +371,7 @@ } }else { const queryParams = { - pageSize: 10, + pageSize: 999, pageNum: 1, } const res = await getCompany(queryParams) diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue index 8a6edce..ef8d588 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/index.vue @@ -11,24 +11,13 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.queryParams.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> </el-form-item> <el-form-item label="年份:" style="margin-left: 20px"> @@ -270,7 +259,7 @@ data.dialogVisible = true } const openDialog = (type,isCom, value) => { - noticeRef.value.openDialog(type, isCom,value); + noticeRef.value.openDialog(type, isCom,value,data.companyList); } const openDeptDialog = (type, value) => { deptRef.value.openDialog(type, value); @@ -284,37 +273,22 @@ }) } -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - }else{ - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } + const handleSizeChange = (val) => { data.queryParams.pageSize = val getList() diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue index c754720..123c2e0 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 == '查看' || 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> @@ -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' ? '编辑' : '查看' ; @@ -311,9 +267,6 @@ state.form.companyId = value.companyId state.form.companyName = value.companyName } - } - if(state.isAdmin){ - await getCompanyList() } await getPeopleList() dialogVisible.value = true; @@ -406,35 +359,17 @@ state.companyList = [] state.qualityList = [] } -const getPeopleList = async (val)=>{ - if(val){ - const queryParams = { - companyId: state.form.companyId == 0 ? null : state.form.companyId, - name: val - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else { - const queryParams = { - pageNum: 1, - pageSize: 10, - companyId: state.form.companyId == 0 ? null : state.form.companyId - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - +const getPeopleList = async ()=> { + const queryParams = { + 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){ @@ -505,7 +440,7 @@ } }else { const queryParams = { - pageSize: 10, + pageSize: 999, pageNum: 1, } const res = await getCompany(queryParams) diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue index 6aeadad..4b8f2a1 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.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 == '查看' || 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> @@ -108,24 +96,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> @@ -143,24 +120,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> @@ -178,24 +144,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> @@ -254,13 +209,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' }], @@ -282,7 +237,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 @@ -290,6 +245,7 @@ if(state.isAdmin){ state.form.companyId = value.companyId state.form.companyName = value.companyName + state.companyList = companyList } await getQualityList() @@ -298,9 +254,7 @@ if(type === 'edit' || type === 'review') { state.form = JSON.parse(JSON.stringify(value)); } - if(state.isAdmin){ - await getCompanyList() - } + await getPeopleList() dialogVisible.value = true; } @@ -391,35 +345,17 @@ state.peopleList = [] state.companyList = [] } -const getPeopleList = async (val)=>{ - if(val){ - const queryParams = { - companyId: state.form.companyId == 0 ? null : state.form.companyId, - name: val - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else { - const queryParams = { - pageNum: 1, - pageSize: 10, - companyId: state.form.companyId == 0 ? null : state.form.companyId - } - const res = await getUser(queryParams) - if (res.code == 200) { - state.peopleList = res.data.list - - } else { - ElMessage.warning(res.message) - } - +const getPeopleList = async ()=> { + const queryParams = { + 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){ @@ -476,31 +412,7 @@ getQualityList() getPeopleList() } -const getCompanyList = async (val)=>{ - if(val){ - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - }else { - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - state.companyList = res.data.list - } else { - ElMessage.warning(res.message) - } - } -} defineExpose({ openDialog }); diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue index 2e24d96..f2d4d26 100644 --- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue +++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/index.vue @@ -11,25 +11,33 @@ >新增</el-button> </el-form-item> <el-form-item label="企业名称:" v-if="data.isAdmin" style="margin-left: 20px"> - <el-select - v-model="data.queryParams.companyName" - filterable - remote - @change="selectValue" - reserve-keyword - placeholder="请输入企业名称" - remote-show-suffix - :remote-method="getCompanyList" - :loading="loadingCompany" - style="width: 240px" - > + <el-select v-model="data.queryParams.companyId" placeholder="请选择" clearable> <el-option v-for="item in data.companyList" :key="item.id" :label="item.name" - :value="item.name" - /> + :value="item.id"> + </el-option> </el-select> +<!-- <el-select--> +<!-- v-model="data.queryParams.companyName"--> +<!-- filterable--> +<!-- remote--> +<!-- @change="selectValue"--> +<!-- reserve-keyword--> +<!-- placeholder="请输入企业名称"--> +<!-- remote-show-suffix--> +<!-- :remote-method="getCompanyList"--> +<!-- :loading="loadingCompany"--> +<!-- style="width: 240px"--> +<!-- >--> +<!-- <el-option--> +<!-- v-for="item in data.companyList"--> +<!-- :key="item.id"--> +<!-- :label="item.name"--> +<!-- :value="item.name"--> +<!-- />--> +<!-- </el-select>--> </el-form-item> <el-form-item label="年份:" style="margin-left: 20px"> <el-select @@ -241,10 +249,10 @@ data.dialogVisible = true } const openDialog = (type, value) => { - noticeRef.value.openDialog(type, value); + noticeRef.value.openDialog(type, value,data.companyList); } const openDeptDialog = (type, value) => { - deptRef.value.openDialog(type, value); + deptRef.value.openDialog(type, value,data.companyList); } const selectValue = (val) => { @@ -255,37 +263,21 @@ }) } -const getCompanyList = async (val)=>{ - if(val){ - loadingCompany.value = true; - const queryParams = { - name: val - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } - }else{ - loadingCompany.value = true; - const queryParams = { - pageSize: 10, - pageNum: 1, - } - const res = await getCompany(queryParams) - if (res.code == 200) { - loadingCompany.value = false; - data.companyList = res.data.list - - } else { - ElMessage.warning(res.message) - } +const getCompanyList = async ()=>{ + const queryParams = { + pageNum: 1, + pageSize: 999 + } + const res = await getCompany(queryParams) + if (res.code == 200) { + data.companyList = res.data.list?res.data.list:[] + // data.queryParams.companyId = data.companyList[0].id + } else { + ElMessage.warning(res.message) } } + const handleSizeChange = (val) => { data.queryParams.pageSize = val getList() -- Gitblit v1.9.2