From c69b50d3fdd7f7113db446398278fbbf9233ad9f Mon Sep 17 00:00:00 2001 From: yxq Date: Wed, 20 Nov 2024 10:59:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8C=96=E5=8A=9E?= =?UTF-8?q?=E5=85=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/common/custompage.js | 4 +-- .../components/learun-app/organize-picker.vue | 1 + .../OfficeEquipment/single.vue | 31 ++++++++++++++----- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js index e4f24fcbb..d2474e34a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js @@ -390,8 +390,8 @@ export default { verify() { return { NotNull: t => t.length > 0 || '不能为空', - Num: t => !isNaN(t) || '须输入数值', - NumOrNull: t => t.length <= 0 || !isNaN(t) || '须留空或输入数值', + Num: t => (t||t===0)&&!isNaN(t) || '须输入数值', + NumOrNull: t => !t || !isNaN(t) || '须留空或输入数值', Email: t => /^[a-zA-Z0-9-_.]+@[a-zA-Z0-9-_]+.[a-zA-Z0-9]+$/.test(t) || '须符合Email格式', EmailOrNull: t => t.length <= 0 || /^[a-zA-Z0-9-_.]+@[a-zA-Z0-9-_]+.[a-zA-Z0-9]+$/.test(t) || '须留空或符合Email格式', diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue index 8f9af647f..50381f4b0 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue @@ -42,6 +42,7 @@ export default { this.ONCE('select-organize', data => { this.$emit('input', data.id||data.map(t=>t.id).toString()) this.$emit('change', data.id||data.map(t=>t.id).toString()) + this.$emit('dataChange', data) }) const rootType = this.rootType || { user: 'department', department: 'company', company: 'company' }[this.type] diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue index 454082936..4b14e9264 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue @@ -3,11 +3,11 @@ - + readonly /> @@ -15,9 +15,8 @@ :value="getValue('OfficeEquipment.DeviceName')" :disabled="!edit" title="资产名称" required /> - + + :value="getValue('OfficeEquipment.Unit')" title="单位" required :range="dataSource.OfficeEquipment.Unit" /> + :value="getValue('OfficeEquipment.Status')" title="使用状态" :range="dataSource.OfficeEquipment.Status" /> @@ -129,7 +128,7 @@ Nuantity: { type: 'text', title: '数量', - verify: "NotNull" + verify: "Num" }, Remark: { type: 'text', @@ -146,6 +145,18 @@ OfficeEquipment: { Name: [], Department: [], + Types: Object.values(this.GET_GLOBAL('dataDictionary').AssType).map(t => ({ + value: t.value, + text: t.text + })), + Status: Object.values(this.GET_GLOBAL('dataDictionary').AssState).map(t => ({ + value: t.value, + text: t.text + })), + Unit: Object.values(this.GET_GLOBAL('dataDictionary').sldw).map(t => ({ + value: t.value, + text: t.text + })), }, } @@ -280,6 +291,10 @@ break } }, + + dataChange(data){ + this.setValue('OfficeEquipment.Department', data.departmentId) + }, // 获取表单值 getValue(path) { From 386aa373e19d7ec38dee679bb4453234b13a59ec Mon Sep 17 00:00:00 2001 From: yxq Date: Wed, 20 Nov 2024 16:42:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8C=96=E5=8A=9E?= =?UTF-8?q?=E5=85=AC=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OfficeEquipment/list.vue | 14 ++-- .../OfficeEquipment/single.vue | 64 ++++++++++--------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/list.vue index b2f91f4e9..d09d34f1e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/list.vue @@ -13,7 +13,7 @@ 使用管理人： - {{ displayListItem(item, 'JZGNo') }} + {{ displayListItem(item, 'UserId') }} @@ -157,7 +157,7 @@ return { // 数据项的数据类型、结构 scheme: { - JZGNo: { + UserId: { type: 'select' }, Department: { @@ -204,7 +204,7 @@ // 数据源 dataSource: { - JZGNo: [], + UserId: [], Department: [], Types: Object.values(this.GET_GLOBAL('dataDictionary').AssType).map(t => ({ value: t.value, @@ -247,9 +247,9 @@ // 拉取加载列表和数据源 await Promise.all([ this.FETCH_DATASOURCE('teacheruserdata').then(result => { - this.dataSource.JZGNo = result.data.map(t => ({ + this.dataSource.UserId = result.data.map(t => ({ text: t.f_realname, - value: t.f_encode, + value: t.f_userid, f_encode: t.f_encode, f_userid: t.f_userid, })); @@ -333,9 +333,9 @@ // 姓名格式化 if (this.searchData.Name_) { - let arr = this.dataSource.JZGNo + let arr = this.dataSource.UserId let obj = arr.find(e => e.f_userid == this.queryData.Name_) - this.searchData.JZGNo = obj ? obj.text : '' + this.searchData.UserId = obj ? obj.text : '' } await this.refreshList(false) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue index 4b14e9264..42dcdb327 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/OfficeEquipment/single.vue @@ -1,36 +1,36 @@