diff --git a/WebSite/src/components/PageQuery/index.vue b/WebSite/src/components/PageQuery/index.vue index 442b46e091dd70584949c5d45cc7208b06d4763e..15b3c227ba91548ac00347877f70df74afeeb860 100644 --- a/WebSite/src/components/PageQuery/index.vue +++ b/WebSite/src/components/PageQuery/index.vue @@ -215,7 +215,6 @@ export default { const { columns, data } = param; const sums = []; columns.forEach((column, index) => { - console.log('鍒�', column); if (index === 0) { sums[index] = '鍚堣'; return; diff --git a/WebSite/src/views/auth-redirect/index.vue b/WebSite/src/views/auth-redirect/index.vue index 2e8ab748f28f5232b541770d4b4087415091456b..c599002c36fea063743f27dca7c43920fe92978b 100644 --- a/WebSite/src/views/auth-redirect/index.vue +++ b/WebSite/src/views/auth-redirect/index.vue @@ -45,7 +45,7 @@ export default { }#/login`; window.location.href = `${data.ssoAddress}?redirect=${encodeURIComponent( redirect_uri - )}&recognizeId=60bcc0b5-11cd-4e20-972e-4e1479034690`; + )}&recognizeId=projectplan`; // )}&recognizeId=${recognizeId}`; // window.location.href = 'http://localhost:3000/#/login' // window.location.href = 'http://192.168.2.10/projectplanweb/login'; diff --git a/WebSite/src/views/yo-common/IncomeApply/index.vue b/WebSite/src/views/yo-common/IncomeApply/index.vue index b97bc6b449c36f9e6a295a3ed694ac51e2de8685..0e811030ceb209ce292afd92321dc48c60663038 100644 --- a/WebSite/src/views/yo-common/IncomeApply/index.vue +++ b/WebSite/src/views/yo-common/IncomeApply/index.vue @@ -51,7 +51,7 @@ <el-option v-for="item in deptList" :key="item.id" - :value="`${item.name + ',' + item.code}`" + :value="item.code" :label="item.name" ></el-option> </el-select> @@ -131,7 +131,7 @@ <el-option v-for="item in deptList" :key="item.id" - :value="`${item.name + ',' + item.code}`" + :value="item.code" :label="item.name" ></el-option> </el-select> @@ -320,7 +320,7 @@ <el-option v-for="item in deptList" :key="item.id" - :value="`${item.name + ',' + item.code}`" + :value="item.code" :label="item.name" ></el-option> </el-select> @@ -499,12 +499,21 @@ export default { watch( () => props.row, val => { - console.log(val); + console.log('val', val); data.flowCanShowOut = val.flowCanShowOut; data.incomeType = val.planType; - console.log('鏁戞晳鎴�', val); + const dept = data.deptList.find( + item => + item.code == val.departmentCode && item.name == val.departmentName + ); + if (!dept) { + data.deptList.push({ + code: val.departmentCode, + name: val.departmentName + }); + } if (val.planType == 'JIAOYU') { - data.eduData.deptNO = val.departmentName + ',' + val.departmentCode; + data.eduData.deptNO = val.departmentCode; let arr = []; val.inComeSubList.forEach(item => { let listItem = JSON.parse(item.subOtherJson); @@ -516,7 +525,7 @@ export default { } else if (val.planType == 'BAXIANG') { data[`${incomeTypeStr.value}` + 'Data'] = JSON.parse(val.otherJson); } else { - data.eduData.deptNO = val.departmentName + ',' + val.departmentCode; + data.eduData.deptNO = val.departmentCode; let arr = []; val.inComeSubList.forEach(item => { let listItem = JSON.parse(item.subOtherJson); @@ -599,9 +608,7 @@ export default { }); }; const getFirstDept = () => { - console.log(data.deptList); - data[`${incomeTypeStr.value}` + 'Data'].deptNO = - data.deptList[0].name + ',' + data.deptList[0].code; + data[`${incomeTypeStr.value}` + 'Data'].deptNO = data.deptList[0].code; }; const getStudent = () => { Api.getStuedents().then(res => { @@ -635,7 +642,12 @@ export default { context.emit('handleBack'); }; const handleSave = () => { - console.log('rowrow', saveData.value); + data.deptList.forEach(item => { + if (item.code == saveData.value.model.deptNO) { + saveData.value.model.deptName = item.name; + } + }); + context.emit('handleSave', saveData.value, props.row.id); }; const handleSubmit = flowOutput => { @@ -729,9 +741,9 @@ export default { const handleCancel = () => { context.emit('handleCancel'); }; - const init = () => { + const init = async () => { + await getDept(); getTypeList(); - getDept(); getStudent(); }; init(); diff --git a/WebSite/src/views/yo-common/ProjectFundApply/index.vue b/WebSite/src/views/yo-common/ProjectFundApply/index.vue index ca1762ee6e34d60f9dea039ff9e3173e8a614252..1ffec24908df69bc4e691c038fca4eee7d8be3fc 100644 --- a/WebSite/src/views/yo-common/ProjectFundApply/index.vue +++ b/WebSite/src/views/yo-common/ProjectFundApply/index.vue @@ -1350,23 +1350,23 @@ export default { item.subjectDetailList = []; } }); - baseinfoData.userList = [{ + baseinfoData.userList.push({ id: applyInfo.projectLeaderId, name: applyInfo.projectLeaderName, code: applyInfo.projectLeaderCode - }] + }); + const dept = baseinfoData.applyDept.find( + item => + item.code == applyInfo.departmentCode && + item.name == applyInfo.departmentName + ); + if (!dept) { + baseinfoData.applyDept.push({ + code: applyInfo.departmentCode, + name: applyInfo.departmentName + }); + } data.applyInfo = applyInfo; - // try { - // if (applyInfo.projectLeaderId) { - // const res = await selectLoadmore(applyInfo.projectLeaderName); - // applyInfo.projectLeaderId = res.data[0].id; - // applyInfo.projectLeaderName = res.data[0].name; - // applyInfo.projectLeaderCode = res.data[0].code; - // data.applyInfo = applyInfo; - // } - // } catch (_) { - // data.applyInfo = applyInfo; - // } } else { data.applyInfo = { year: window.sessionStorage.getItem('year'), @@ -1401,7 +1401,7 @@ export default { } ); const init = async () => { - getApplyDept(); + await getApplyDept(); getMeritsTree(); // const leader = store.state.subject.leader; // await selectLoadmore(leader.name); diff --git a/WebSite/src/views/yo-common/PublicFundApply/index.vue b/WebSite/src/views/yo-common/PublicFundApply/index.vue index be4e5616d1d55bc40dd3c321f80a95acf2a4ab9c..f8161c41ee0a50e6260fad81edf537fdefdfcce6 100644 --- a/WebSite/src/views/yo-common/PublicFundApply/index.vue +++ b/WebSite/src/views/yo-common/PublicFundApply/index.vue @@ -837,7 +837,7 @@ export default { }; watch( () => props.row, - val => { + async val => { const length = Object.keys(val).length; if (length > 0) { let applyInfo = JSON.parse(JSON.stringify(val)); @@ -853,6 +853,24 @@ export default { item.subjectDetailList = []; } }); + baseinfoData.userList = [ + { + id: applyInfo.projectLeaderId, + name: applyInfo.projectLeaderName, + code: applyInfo.projectLeaderCode + } + ]; + const dept = baseinfoData.applyDept.find( + item => + item.code == applyInfo.departmentCode && + item.name == applyInfo.departmentName + ); + if (!dept) { + baseinfoData.applyDept.push({ + code: applyInfo.departmentCode, + name: applyInfo.departmentName + }); + } data.applyInfo = applyInfo; } else { data.applyInfo = { @@ -875,6 +893,11 @@ export default { } } }; + const leader = store.state.subject.leader; + data.applyInfo.projectLeaderId = leader.id; + data.applyInfo.projectLeaderName = leader.name; + data.applyInfo.projectLeaderCode = leader.code; + selectLoadmore(leader.name); } }, { @@ -962,15 +985,15 @@ export default { return sums; }; const init = async () => { - getApplyDept(); + await getApplyDept(); queryDailyFund(); - const leader = store.state.subject.leader; - console.log('111', leader); - await selectLoadmore(leader.name); - data.applyInfo.projectLeaderId = leader.id; - console.log('222', data.applyInfo.projectLeaderId); - data.applyInfo.projectLeaderName = leader.name; - data.applyInfo.projectLeaderCode = leader.code; + // const leader = store.state.subject.leader; + // console.log('111', leader); + // await selectLoadmore(leader.name); + // data.applyInfo.projectLeaderId = leader.id; + // console.log('222', data.applyInfo.projectLeaderId); + // data.applyInfo.projectLeaderName = leader.name; + // data.applyInfo.projectLeaderCode = leader.code; }; init(); return { diff --git a/WebSite/src/views/yo-dept-bz/first/IncomeApply/components/Detail.vue b/WebSite/src/views/yo-dept-bz/first/IncomeApply/components/Detail.vue index b29a5bbc93ef51f5facdcf00e69507157511fa2a..66342636638f89a60b708a4f9cd5f50244ca1126 100644 --- a/WebSite/src/views/yo-dept-bz/first/IncomeApply/components/Detail.vue +++ b/WebSite/src/views/yo-dept-bz/first/IncomeApply/components/Detail.vue @@ -58,8 +58,8 @@ export default { }); Api.saveInCome({ id: id ? id : '', - departmentCode: obj.model.deptNO.split(',')[1], - departmentName: obj.model.deptNO.split(',')[0], + departmentCode: obj.model.deptNO, + departmentName: obj.model.deptName, inComeSubList: arr, planType: obj.incomeType, inComePlanType: props.type @@ -71,10 +71,11 @@ export default { // handleBack(); }); } else if (obj.incomeType == 'BAXIANG') { + console.log('obj.model.deptName', obj.model.deptName); Api.saveInComeE({ id: id ? id : '', - departmentCode: obj.model.deptNO.split(',')[1], - departmentName: obj.model.deptNO.split(',')[0], + departmentCode: obj.model.deptNO, + departmentName: obj.model.deptName, otherJson: JSON.stringify(obj.model), planType: obj.incomeType, attachmentInfoOutList: obj.model.attachmentInfoOutList,