admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-08-04 15:29:29 +08:00
parent 32db9ce5b5
commit a199afe1ff
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/goverment/qualitySupervision/components/orderAdd.vue
View File

@ -498,6 +498,7 @@ const basicData = ref({
const dialogStyle = ref({ const dialogStyle = ref({
"min-width": "824px" "min-width": "824px"
}); });
const noConfirmMemberList = ref([]); // 未确认时的选中的检查人员列表
const selectedMemberList = ref([]); // 选中的检查人员列表 const selectedMemberList = ref([]); // 选中的检查人员列表
const selectedSmallList = ref([]); // 选中的小项列表 const selectedSmallList = ref([]); // 选中的小项列表
// 设置日期的禁用状态 // 设置日期的禁用状态
@ -574,14 +575,19 @@ const addDangerRecord = () => {
}; };
const confirmMemberSelected = () => { const confirmMemberSelected = () => {
let selectedtext = ""; let selectedtext = "";
for (let i = 0; i < selectedMemberList.value.length; i++) { selectedMemberList.value = noConfirmMemberList.value;
if (i == selectedMemberList.value.length - 1) { if (selectedMemberList.value.length > 0) {
selectedtext += selectedMemberList.value[i].realName; for (let i = 0; i < selectedMemberList.value.length; i++) {
} else { if (i == selectedMemberList.value.length - 1) {
selectedtext += selectedMemberList.value[i].realName + ","; selectedtext += selectedMemberList.value[i].realName;
} else {
selectedtext += selectedMemberList.value[i].realName + ",";
}
} }
basicData.value.selectedMember = selectedtext;
} else {
basicData.value.selectedMember = "";
} }
basicData.value.selectedMember = selectedtext;
memberVisible.value = false; memberVisible.value = false;
}; };
const projectRowClick = row => { const projectRowClick = row => {
@ -643,8 +649,6 @@ const getMemberList = async () => {
membertableData.value = res.result; membertableData.value = res.result;
}; };
const selectMember = async () => { const selectMember = async () => {
console.log(membertableData.value);
console.log(selectedMemberList.value);
selectedMemberList.value.forEach(key => { selectedMemberList.value.forEach(key => {
membertableData.value.forEach(row => { membertableData.value.forEach(row => {
if (row.userId == key.userId) { if (row.userId == key.userId) {
@ -684,7 +688,8 @@ const uploadSuccess = (response: any, index: number) => {
// console.log(selectedMemberList.value); // console.log(selectedMemberList.value);
// }; // };
const handleSelectionChange = val => { const handleSelectionChange = val => {
selectedMemberList.value = val; noConfirmMemberList.value = val;
// selectedMemberList.value = val;
console.log(val); console.log(val);
}; };
// const handleSelectionAllChange = val => { // const handleSelectionAllChange = val => {
@ -744,10 +749,10 @@ const allSubmit = async () => {
ElMessage.error("请选择工程/项目"); ElMessage.error("请选择工程/项目");
return; return;
} }
// if (!basicData.value.selectedMember) { if (!basicData.value.selectedMember) {
// ElMessage.error("请选择检查人员"); ElMessage.error("请选择检查人员");
// return; return;
// } }
if (!basicData.value.deadline) { if (!basicData.value.deadline) {
ElMessage.error("请选择整改期限"); ElMessage.error("请选择整改期限");
return; return;

30
src/views/goverment/safetySupervision/components/orderAdd.vue
View File

@ -496,6 +496,7 @@ const basicData = ref({
const dialogStyle = ref({ const dialogStyle = ref({
"min-width": "824px" "min-width": "824px"
}); });
const noConfirmMemberList = ref([]); // 未确认时的选中的检查人员列表
const selectedMemberList = ref([]); // 选中的检查人员列表 const selectedMemberList = ref([]); // 选中的检查人员列表
const selectedSmallList = ref([]); // 选中的小项列表 const selectedSmallList = ref([]); // 选中的小项列表
// 设置日期的禁用状态 // 设置日期的禁用状态
@ -572,14 +573,19 @@ const addDangerRecord = () => {
}; };
const confirmMemberSelected = () => { const confirmMemberSelected = () => {
let selectedtext = ""; let selectedtext = "";
for (let i = 0; i < selectedMemberList.value.length; i++) { selectedMemberList.value = noConfirmMemberList.value;
if (i == selectedMemberList.value.length - 1) { if (selectedMemberList.value.length > 0) {
selectedtext += selectedMemberList.value[i].realName; for (let i = 0; i < selectedMemberList.value.length; i++) {
} else { if (i == selectedMemberList.value.length - 1) {
selectedtext += selectedMemberList.value[i].realName + ","; selectedtext += selectedMemberList.value[i].realName;
} else {
selectedtext += selectedMemberList.value[i].realName + ",";
}
} }
basicData.value.selectedMember = selectedtext;
} else {
basicData.value.selectedMember = "";
} }
basicData.value.selectedMember = selectedtext;
memberVisible.value = false; memberVisible.value = false;
}; };
const projectRowClick = row => { const projectRowClick = row => {
@ -641,8 +647,6 @@ const getMemberList = async () => {
membertableData.value = res.result; membertableData.value = res.result;
}; };
const selectMember = async () => { const selectMember = async () => {
console.log(membertableData.value);
console.log(selectedMemberList.value);
selectedMemberList.value.forEach(key => { selectedMemberList.value.forEach(key => {
membertableData.value.forEach(row => { membertableData.value.forEach(row => {
if (row.userId == key.userId) { if (row.userId == key.userId) {
@ -671,7 +675,7 @@ const uploadSuccess = (response: any, index: number) => {
} }
}; };
const handleSelectionChange = val => { const handleSelectionChange = val => {
selectedMemberList.value = val; noConfirmMemberList.value = val;
console.log(val); console.log(val);
}; };
const handleSmallSelectionChange = val => { const handleSmallSelectionChange = val => {
@ -727,10 +731,10 @@ const allSubmit = async () => {
ElMessage.error("请选择工程/项目"); ElMessage.error("请选择工程/项目");
return; return;
} }
// if (!basicData.value.selectedMember) { if (!basicData.value.selectedMember) {
// ElMessage.error("请选择检查人员"); ElMessage.error("请选择检查人员");
// return; return;
// } }
if (!basicData.value.deadline) { if (!basicData.value.deadline) {
ElMessage.error("请选择整改期限"); ElMessage.error("请选择整改期限");
return; return;