合并
This commit is contained in:
@ -109,7 +109,12 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="设计人员" prop="principal">
|
||||
<el-select :disabled="!form.specialty" v-model="form.principal" placeholder="请选择设计人员" class="transition-all duration-300 border-gray-300">
|
||||
<el-select
|
||||
:disabled="!form.specialty"
|
||||
v-model="form.principal"
|
||||
placeholder="请选择设计人员"
|
||||
class="transition-all duration-300 border-gray-300"
|
||||
>
|
||||
<el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -146,12 +151,16 @@
|
||||
/></el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
|
||||
<<<<<<< HEAD
|
||||
<file-upload
|
||||
:fileType="['pdf']"
|
||||
:isShowTip="false"
|
||||
:fileSize="100"
|
||||
. v-model="uploadForm.fileIds"
|
||||
></file-upload>
|
||||
=======
|
||||
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
|
||||
>>>>>>> 8a3f338e2734575bcb743e917b1232bedc76f105
|
||||
</el-form-item>
|
||||
<el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
|
||||
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
|
||||
@ -252,7 +261,8 @@ import {
|
||||
delVolumeCatalog,
|
||||
addVolumeCatalog,
|
||||
updateVolumeCatalog,
|
||||
uploadVolumeFile,majorList,
|
||||
uploadVolumeFile,
|
||||
majorList,
|
||||
getVolumeCatafileList,
|
||||
volumeFileList
|
||||
} from '@/api/design/volumeCatalog';
|
||||
@ -263,10 +273,10 @@ import TableContent from './comm/tableContent.vue';
|
||||
const fileList = ref([]);
|
||||
import { designUserList } from '@/api/design/appointment';
|
||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||
const { design_state, wf_business_status, } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
|
||||
const { design_state, wf_business_status } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
|
||||
import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
|
||||
const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
|
||||
const des_user_major= ref([]);
|
||||
const des_user_major = ref([]);
|
||||
const buttonLoading = ref(false);
|
||||
const loading = ref(true);
|
||||
const showSearch = ref(true);
|
||||
@ -361,21 +371,21 @@ const data = reactive({
|
||||
documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }],
|
||||
plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }],
|
||||
principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }],
|
||||
specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }],
|
||||
specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }]
|
||||
}
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
const changeSpecialty=(val)=>{
|
||||
const changeSpecialty = (val) => {
|
||||
form.value.principal = ''; //清空
|
||||
getUserAppList(val);
|
||||
}
|
||||
};
|
||||
// 获取专业列表
|
||||
const getSpecialtyList = async () => {
|
||||
const res = await majorList({ projectId: currentProject.value?.id ,userType:2});
|
||||
const res = await majorList({ projectId: currentProject.value?.id, userType: 2 });
|
||||
console.log(res);
|
||||
if (res.code === 200) {
|
||||
des_user_major.value = res.data;
|
||||
des_user_major.value = res.data;
|
||||
}
|
||||
};
|
||||
/** 查询卷册目录列表 */
|
||||
@ -390,7 +400,7 @@ const getList = async () => {
|
||||
}
|
||||
};
|
||||
const getUserAppList = async (userMajor) => {
|
||||
const res = await designUserList({ projectId: currentProject.value?.id ,userType:2,userMajor});
|
||||
const res = await designUserList({ projectId: currentProject.value?.id, userType: 2, userMajor });
|
||||
if (res.code === 200) {
|
||||
userAppList.value = res.rows;
|
||||
}
|
||||
@ -655,7 +665,7 @@ const handleAuditInfo = (row) => {
|
||||
// 审核图纸
|
||||
};
|
||||
onMounted(() => {
|
||||
getSpecialtyList();
|
||||
getSpecialtyList();
|
||||
getList();
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user