From f2560485ad0972239dcbca4bfd29759a37017c8f Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 24 Oct 2022 10:41:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js index 06af73f83..d75a72e86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js @@ -75,8 +75,8 @@ var bootstrap = function ($, learun) { learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoList', {}, function (data) { schemeList = data; //增加资产申请项目 - schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' }); - schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' }); + //schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' }); + //schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' }); render(); }); From b81b58340e72c6f01b227f111e0f02a47a59dfe4 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 24 Oct 2022 14:47:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=BE=E5=AD=97+=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js index 281f6bd19..58999ebf9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js @@ -271,7 +271,7 @@ setTimeout(function () { (b.operaSupport && a.browser.opera ? c : e[0].contentWindow).print(); c && c.close() - }, 1E3) + }, 3000) } From 0613772e64ad18505a4202fb0cb9ee83f1460bfc Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 24 Oct 2022 15:15:43 +0800 Subject: [PATCH 3/9] =?UTF-8?q?pc=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4=E5=90=8C=E6=84=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index efff7aa67..2d358bbf2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -1342,6 +1342,7 @@ var bootstrap = function ($, learun) { var _department = departmentMap[userMap[_jitem.Id].departmentId]; if (_department) { name = '【' + _department.name + '】' + name; + //name = '【' + _department.name + '】' + name; } nameList.push(name); @@ -1435,7 +1436,7 @@ var bootstrap = function ($, learun) { name = '【' + _department.name + '】' + name; } } - var content = item.F_OperationName; + var content = ''; if (item.F_Des) { content += '【审批意见】' + item.F_Des; } From 6325437f2b1fbb0da5712db03f00353aaa6b65d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Mon, 24 Oct 2022 18:31:22 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=80=92=E5=8F=99=E6=8E=92=E5=BA=8F=20=20=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=85=AC=E5=8F=B8=E6=A0=87=E7=AD=BE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/common/mixins.js | 26 ++++++++++++++++++- .../learun-app/organize-single-item.vue | 2 +- .../components/learun-app/organize-tree.vue | 2 +- .../ArrangeLessonTermAttemper/list.vue | 4 +-- .../StuGraduateStatistic/list.vue | 2 +- .../StuInfoFresh/PayFee/list.vue | 2 +- .../Thermography/list.vue | 2 +- .../Thermography/single.vue | 2 +- .../Acc_DailyAssess/list.vue | 6 ++--- .../Acc_DailyAssess/single.vue | 6 ++--- .../Acc_GoodsDemage/list.vue | 6 ++--- .../Acc_GoodsDemage/single.vue | 6 ++--- .../Acc_PublicAreaHealth/list.vue | 6 ++--- .../Acc_PublicAreaHealth/single.vue | 6 ++--- .../Acc_StuDayRoutine/list.vue | 6 ++--- .../Acc_StuDayRoutine/single.vue | 6 ++--- .../ListenClassRecord/single.vue | 2 +- .../PersonnelManagement/ClassWork/list.vue | 2 +- .../PersonnelManagement/ClassWork/single.vue | 2 +- .../pages/common/select-organize-multiple.vue | 8 +++--- .../pages/common/select-organize.vue | 8 +++--- .../LearunApp-2.2.0/pages/contact.vue | 2 +- .../pages/timeTable/leaveFrom.vue | 2 +- 23 files changed, 70 insertions(+), 46 deletions(-) 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 cb8682dab..71616d939 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 @@ -199,13 +199,37 @@ export default { OFF(name, func) { uni.$off(name, func) }, + + // sortArr(array,num=0){ + // let arr = JSON.parse(JSON.stringify(array)) + // for(let i = 0;i ({ text: t.lessonname, value: t.lessonno })); }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.TeachClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })); + this.dataSource.TeachClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })); }), this.FETCH_DATASOURCE('EmpInfo').then(result => { this.dataSource.EmpNo = result.data.map(t => ({ text: t.empname, value: t.empno })); @@ -254,7 +254,7 @@ export default { this.dataSource.NewLessonNo = result.data.map(t => ({ text: t.lessonname, value: t.lessonno })); }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.NewTeachClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })); + this.dataSource.NewTeachClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })); }), this.FETCH_DATASOURCE('EmpInfo').then(result => { this.dataSource.NewEmpNo = result.data.map(t => ({ text: t.empname, value: t.empno })); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue index 5380d72e6..ae971de29 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue @@ -222,7 +222,7 @@ export default { this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('DIC_PROVINCE').then(result => { this.dataSource.EmployerProvince = result.data.map(t => ({ text: t.pname, value: t.pcode })) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue index 7e8f1dfb6..1b068f047 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/list.vue @@ -149,7 +149,7 @@ export default { // 拉取加载列表和数据源 await Promise.all([ this.FETCH_DATASOURCE('bjsj').then(data => { - this.dataSource.ClassNo = data.data.map(t => ({ + this.dataSource.ClassNo = data.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue index 6cebd0034..68c26832c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue @@ -195,7 +195,7 @@ export default { // 拉取加载列表和数据源 await Promise.all([ this.FETCH_DATASOURCE('bjsj').then(data => { - this.dataSource.ClassNo = data.data.map(t => ({ + this.dataSource.ClassNo = data.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue index 5d7a49f26..a7b407d62 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue @@ -164,7 +164,7 @@ export default { // 拉取表单数据，同时拉取所有来自数据源的选单数据 await Promise.all([ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Thermography.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Thermography.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('BaseUser').then(result => { this.dataSource.Thermography.MeasurerID = result.data.map(t => ({ text: t.f_realname, value: t.f_account })) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue index 791842034..3f7351125 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue @@ -270,7 +270,7 @@ export default { this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { this.dataSource.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) @@ -441,11 +441,11 @@ export default { async MajorNoChange(){ if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.queryData.ClassNo=''; 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 191723ece..b4f4404d1 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 @@ -246,7 +246,7 @@ export default { this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { this.dataSource.Acc_DailyAssess.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) @@ -433,11 +433,11 @@ export default { async MajorNoChange(){ if (this.getValue('Acc_DailyAssess.MajorNo') != null && this.getValue('Acc_DailyAssess.MajorNo')!=undefined && this.getValue('Acc_DailyAssess.MajorNo') != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_DailyAssess.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.getValue('Acc_DailyAssess.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.setValue('Acc_DailyAssess.ClassNo',''); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue index 160e5fa6a..da216de2b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue @@ -217,7 +217,7 @@ export default { this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { this.dataSource.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) @@ -388,11 +388,11 @@ export default { async MajorNoChange(){ if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.queryData.ClassNo=''; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue index 61fcf9dee..1c951e712 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue @@ -197,7 +197,7 @@ export default { this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { this.dataSource.Acc_GoodsDemage.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) @@ -379,11 +379,11 @@ export default { async MajorNoChange(){ if (this.getValue('Acc_GoodsDemage.MajorNo') != null && this.getValue('Acc_GoodsDemage.MajorNo')!=undefined && this.getValue('Acc_GoodsDemage.MajorNo') != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_GoodsDemage.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.getValue('Acc_GoodsDemage.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.setValue('Acc_GoodsDemage.ClassNo',''); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue index 7f375811d..2f2214cbb 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue @@ -205,7 +205,7 @@ export default { this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) @@ -364,11 +364,11 @@ export default { async MajorNoChange(){ if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.queryData.ClassNo=''; 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 20db34900..15ea86543 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 @@ -188,7 +188,7 @@ export default { this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return b.classno-a.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,classno:t.classno })) @@ -323,11 +323,11 @@ export default { async MajorNoChange(){ if (this.getValue('Acc_PublicAreaHealth.MajorNo') != null && this.getValue('Acc_PublicAreaHealth.MajorNo')!=undefined && this.getValue('Acc_PublicAreaHealth.MajorNo') != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_PublicAreaHealth.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.getValue('Acc_PublicAreaHealth.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.setValue('Acc_PublicAreaHealth.ClassNo',''); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue index 1d01c22da..4ca637158 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue @@ -205,7 +205,7 @@ export default { this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), this.FETCH_DATASOURCE('StuInfoBasic').then(result => { this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) @@ -364,11 +364,11 @@ export default { async MajorNoChange(){ if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.queryData.ClassNo=''; 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 f4bdd6b18..35422d908 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 @@ -188,7 +188,7 @@ export default { this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return b.classno-a.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,classno:t.classno })) @@ -323,11 +323,11 @@ export default { async MajorNoChange(){ if (this.getValue('Acc_StuDayRoutine.MajorNo') != null && this.getValue('Acc_StuDayRoutine.MajorNo')!=undefined && this.getValue('Acc_StuDayRoutine.MajorNo') != "") { this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_StuDayRoutine.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).filter(t=>t.majorno===this.getValue('Acc_StuDayRoutine.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) }) }else{ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }) } this.setValue('Acc_StuDayRoutine.ClassNo',''); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue index 4ecbd8017..a3f2c9cc4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/ListenClassRecord/single.vue @@ -290,7 +290,7 @@ export default { this.dataSource.ListenClassRecord.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) }), this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ListenClassRecord.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ListenClassRecord.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue index a455afd77..1efc36c72 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue @@ -153,7 +153,7 @@ export default { // 拉取加载列表和数据源 await Promise.all([ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue index c87499251..d89b45a72 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue @@ -121,7 +121,7 @@ export default { // 拉取表单数据，同时拉取所有来自数据源的选单数据 await Promise.all([ this.FETCH_DATASOURCE('bjsj').then(result => { - this.dataSource.ClassWork.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) + this.dataSource.ClassWork.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) }), diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue index 2ecdfc75d..c19ec196c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue @@ -36,7 +36,7 @@ export default { type: null, contactList: [], searchText: '', - placeholder: '搜索公司名/部门名/职员姓名', + placeholder: '搜索学校名/部门名/职员姓名', root: { type: 'company', id: '0' }, items:[], ids:'', @@ -72,8 +72,8 @@ export default { } this.placeholder = { user: '搜索职员姓名', - department: '搜索公司名/部门名', - company: '搜索公司名/部门名/职员姓名' + department: '搜索学校名/部门名', + company: '搜索学校名/部门名/职员姓名' }[type] if (rootId && rootId !== 'undefined' && rootId !== 'null') { @@ -81,7 +81,7 @@ export default { } this.type = type || 'user' - const selectType = { user: '职员', department: '部门', company: '公司' }[type] + const selectType = { user: '职员', department: '部门', company: '学校' }[type] this.SET_TITLE(`请选择${selectType}`) }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize.vue index bd970a166..1a17d9121 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize.vue @@ -19,7 +19,7 @@ export default { type: null, contactList: [], searchText: '', - placeholder: '搜索公司名/部门名/职员姓名', + placeholder: '搜索学校名/部门名/职员姓名', root: { type: 'company', id: '0' } } }, @@ -41,8 +41,8 @@ export default { async init(type, rootId, rootType) { this.placeholder = { user: '搜索职员姓名', - department: '搜索公司名/部门名', - company: '搜索公司名/部门名/职员姓名' + department: '搜索学校名/部门名', + company: '搜索学校名/部门名/职员姓名' }[type] if (rootId && rootId !== 'undefined' && rootId !== 'null') { @@ -50,7 +50,7 @@ export default { } this.type = type || 'user' - const selectType = { user: '职员', department: '部门', company: '公司' }[type] + const selectType = { user: '职员', department: '部门', company: '学校' }[type] this.SET_TITLE(`请选择一个${selectType}`) }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue index fb4c21cb9..a9d270d11 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue @@ -1,7 +1,7 @@