From ac88ba649b7951cedb5a93afe36651e13ca31261 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 10:51:05 +0800
Subject: [PATCH] 最新版本
---
admin/src/utils/form.js | 56 ++++++++++++++++++++++++++++
admin/src/api/meeting/projects.js | 7 +--
admin/src/views/meeting/components/OperaRoomsWindow.vue | 15 ++++---
admin/src/views/meeting/projects.vue | 7 +--
admin/src/views/meeting/rooms.vue | 3 +
admin/src/views/meeting/components/OperaBookingsWindow.vue | 6 +-
6 files changed, 76 insertions(+), 18 deletions(-)
diff --git a/admin/src/api/meeting/projects.js b/admin/src/api/meeting/projects.js
index 30bb958..03d4b53 100644
--- a/admin/src/api/meeting/projects.js
+++ b/admin/src/api/meeting/projects.js
@@ -24,14 +24,13 @@
return request.post('/meetingAdmin/cloudService/business/projects/updateById', data)
}
// 浼氳鍏宠仈鐨勯」鐩�
-export function findListByObjId ({objId, objType}) {
- // return request.post('/meetingAdmin/cloudService/business/projects/findListByObjId', { params })
- return request.post(`/meetingAdmin/cloudService/projects/findListByObjId?objId=${objId}&objType=${objType}`)
+export function findListByObjId (data) {
+ return request.post('/meetingAdmin/cloudService/business/projects/findListByObjId', data)
}
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/meetingAdmin/cloudService/projects/delete/${id}`)
+ return request.get(`/meetingAdmin/cloudService/business/projects/delete/${id}`)
}
// 鎵归噺鍒犻櫎
diff --git a/admin/src/utils/form.js b/admin/src/utils/form.js
index 90af3c2..52ef5cf 100644
--- a/admin/src/utils/form.js
+++ b/admin/src/utils/form.js
@@ -23,3 +23,59 @@
}
callback()
}
+
+
+export function numRule(rule, value, callback) {
+ // debugger
+ if (value == null || value < 0 || !value) {
+ callback(new Error())
+ } else {
+ callback()
+ }
+}
+export function arrayRule(rule, value, callback) {
+ // debugger
+ if (value == null || value.length <= 0 || !value) {
+ callback(new Error())
+ } else {
+ callback()
+ }
+}
+
+export function nameRule (rule, value, callback) {
+ if (value == null || value.trim() === '') {
+ if (rule.required) {
+ callback(new Error('璇疯緭鍏ュ悕瀛�'))
+ } else {
+ callback()
+ }
+ return
+ }
+ callback()
+ // let re = /^[\u4e00-\u9fa5]+$/g;
+ // var result = re.test(value)
+ // if(!result) {
+ // callback(new Error('璇疯緭鍏ユ纭殑鍚嶅瓧'))
+ // } else {
+ // callback()
+ // }
+}
+export function creditCode (rule, value, callback) {
+ if (value == null || value.trim() === '') {
+ if (rule.required) {
+ callback(new Error('璇疯緭鍏ョぞ浼氫俊鐢ㄤ唬鐮�'))
+ } else {
+ callback()
+ }
+ return
+ }
+ let re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
+ var result = re.test(value)
+ if(!result) {
+ callback(new Error('璇疯緭鍏ユ纭殑绀句細淇＄敤浠ｇ爜'))
+ } else {
+ callback()
+ }
+}
+
+
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 0af16af..b998662 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -101,7 +101,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import FileLink from '@/views/meeting/components/common/FileLink'
-import { uploadFileLocal as upload } from '@/api/system/common'
+import { upload as upload } from '@/api/system/common'
import { fetchList as userList } from '@/api/system/user'
import { findListByObjId } from '@/api/meeting/projects'
import { findList } from '@/api/meeting/roomTime'
@@ -211,8 +211,8 @@
selectRoom(objId) {
this.getTimes()
findListByObjId({
- objId,
- objType: 0,
+ objId: objId,
+ objType: 0
})
.then(res => {
this.projectList = res
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index 853154d..cbb22d9 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -101,20 +101,20 @@
id: null,
sysList: [],
projectList: [],
- createDate: '',
+ createDate: null,
editor: '',
- editDate: '',
- isdeleted: '',
+ editDate: null,
+ isdeleted: 0,
name: '',
remark: '',
startTime: '',
endTime: '',
- limitNum: '',
+ limitNum: 0,
imgurl: '',
imgFullUrl: '',
tips: '',
- status: '',
- intervalTime: ''
+ status: 0,
+ intervalTime: 0
},
user: [],
projectList: [],
@@ -178,6 +178,9 @@
this.form.projectList = this.form.projectList ? target.projectList.map(item => item.projectId) : []
this.form.sysList = this.form.sysList ? this.form.sysList.map(item => item.userId) : []
// console.log(this.form.imgFullUrl);
+ console.log(this.form)
+ console.log(this.form.intervalTime)
+ console.log(target)
})
},
selectRange(v) {
diff --git a/admin/src/views/meeting/projects.vue b/admin/src/views/meeting/projects.vue
index 4ccd9e6..884eb7c 100644
--- a/admin/src/views/meeting/projects.vue
+++ b/admin/src/views/meeting/projects.vue
@@ -58,7 +58,7 @@
<!-- {{ row.imgurlfull }} -->
<el-image
v-if="!!row.imgurlfull"
- style="width: 80px; height: 40px;"
+ style="width: 40px; height: 40px;"
:src="row.imgurlfull"
:preview-src-list="[row.imgurlfull]"
></el-image>
@@ -67,12 +67,11 @@
<el-table-column prop="name" label="鍚嶇О" align="center" min-width="100px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="100px"></el-table-column>
-
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" align="center" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:projects:update', 'business:projects:delete'])"
label="鎿嶄綔"
min-width="120"
- fixed="right"
align="center"
>
<template slot-scope="{row}">
@@ -123,7 +122,7 @@
created () {
this.config({
module: '鏈嶅姟椤圭洰淇℃伅琛�',
- api: '@/views/meeting/api/projects',
+ api: '/meeting/projects',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index a8ef660..d75760a 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -11,6 +11,7 @@
filterable
clearable
multiple
+ style="width: 250px"
placeholder="閫夋嫨閮ㄩ棬鎴愬憳"
>
<el-option
@@ -84,8 +85,8 @@
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
<!-- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="imgurl" label="浼氳瀹ゅ浘鐗�" min-width="100px"></el-table-column>
--
Gitblit v1.9.3