diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js index 00875baae..cb8682dab 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js @@ -205,11 +205,7 @@ export default { if (!code) { return [] } - - return await this.HTTP_GET('learun/adms/datasource/map', { - code, - ver: '' - }) + return await this.HTTP_GET('learun/adms/datasource/map', {code,ver: ''}) }, // 拉取指定规则编号的表单编码数据 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue index 3b7afe0f2..191723ece 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue @@ -215,7 +215,9 @@ export default { StuNo:[], }, - } + } , + + StuNoAll:[], } }, @@ -259,7 +261,8 @@ export default { this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno,classno:t.classno })) + this.StuNoAll = JSON.parse(JSON.stringify(this.dataSource.Acc_DailyAssess.StuNo)) }), @@ -442,14 +445,17 @@ export default { }, //多条件查询:班级改变事件 async ClassNoChange(){ - if (this.getValue('Acc_DailyAssess.ClassNo') != null && this.getValue('Acc_DailyAssess.ClassNo')!=undefined && this.getValue('Acc_DailyAssess.ClassNo') != "") { - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_DailyAssess.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_DailyAssess.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) - }) + if (!this.getValue('Acc_DailyAssess.ClassNo')) { + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_DailyAssess.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_DailyAssess.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_DailyAssess.StuNo = this.StuNoAll + }else{ - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) - }) + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_DailyAssess.StuNo = this.StuNoAll.filter(t=>t.classno == this.getValue('Acc_DailyAssess.ClassNo')) } this.setValue('Acc_DailyAssess.StuNo',''); }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue index 2d25b07dd..20db34900 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue @@ -157,7 +157,9 @@ export default { StuNo:[], }, - } + } , + + StuNoAll:[], } }, @@ -189,7 +191,8 @@ export default { this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno,classno:t.classno })) + this.StuNoAll = JSON.parse(JSON.stringify(this.dataSource.Acc_PublicAreaHealth.StuNo)) }), @@ -332,14 +335,16 @@ export default { }, //多条件查询:班级改变事件 async ClassNoChange(){ - if (this.getValue('Acc_PublicAreaHealth.ClassNo') != null && this.getValue('Acc_PublicAreaHealth.ClassNo')!=undefined && this.getValue('Acc_PublicAreaHealth.ClassNo') != "") { - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_PublicAreaHealth.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) - }) + if (!this.getValue('Acc_PublicAreaHealth.ClassNo')) { + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_PublicAreaHealth.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_PublicAreaHealth.StuNo = this.StuNoAll }else{ - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) - }) + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_PublicAreaHealth.StuNo = this.StuNoAll.filter(t=>t.classno == this.getValue('Acc_PublicAreaHealth.ClassNo')) } this.setValue('Acc_PublicAreaHealth.StuNo',''); }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue index 9f97d5eaa..f4bdd6b18 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue @@ -157,7 +157,9 @@ export default { StuNo:[], }, - } + } , + + StuNoAll:[], } }, @@ -189,7 +191,8 @@ export default { this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno,classno:t.classno })) + this.StuNoAll = JSON.parse(JSON.stringify(this.dataSource.Acc_StuDayRoutine.StuNo)) }), @@ -332,14 +335,16 @@ export default { }, //多条件查询:班级改变事件 async ClassNoChange(){ - if (this.getValue('Acc_StuDayRoutine.ClassNo') != null && this.getValue('Acc_StuDayRoutine')!=undefined && this.getValue('Acc_StuDayRoutine.ClassNo') != "") { - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_StuDayRoutine.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_StuDayRoutine.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) - }) + if (!this.getValue('Acc_StuDayRoutine.ClassNo')) { + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_StuDayRoutine.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_StuDayRoutine.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_StuDayRoutine.StuNo = this.StuNoAll }else{ - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) - }) + // this.FETCH_DATASOURCE('StuInfoBasic').then(result => { + // this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + // }) + this.dataSource.Acc_StuDayRoutine.StuNo = this.StuNoAll.filter(t=>t.classno == this.getValue('Acc_StuDayRoutine.ClassNo')) } this.setValue('Acc_StuDayRoutine.StuNo',''); },