diff --git a/dist.zip b/dist.zip
index d913c03..1318d84 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/public/video/project_study_video.mp4 b/public/video/project_study_video.mp4
index a41d860..41b874a 100644
Binary files a/public/video/project_study_video.mp4 and b/public/video/project_study_video.mp4 differ
diff --git a/src/components/layout/index.vue b/src/components/layout/index.vue
index 81f2ab0..0b5dbe7 100644
--- a/src/components/layout/index.vue
+++ b/src/components/layout/index.vue
@@ -27,7 +27,7 @@ const { proxy } = getCurrentInstance(),
Cookie.remove('token')
localStorage.clear()
router.push('/login')
- window.location.reload()
+ // window.location.reload()
},
// 申请权限
apply = () => {
diff --git a/src/http/apis/expertManage/reviewMeeting.js b/src/http/apis/expertManage/reviewMeeting.js
index 11c2b47..e1b8818 100644
--- a/src/http/apis/expertManage/reviewMeeting.js
+++ b/src/http/apis/expertManage/reviewMeeting.js
@@ -6,6 +6,8 @@ export const createMeeting = data => http.post('/api/v1/meeting/create', data) /
export const randomInviteExpect = data => http.post('/api/v1/meeting/random-invite-expect', data) // 新建会议java
+export const continueInviteDisposable = data => http.post('/api/v1/meeting/continueInvite-disposable', data) // 一次性续抽专家
+
export const meetingList = params => http.get('/api/v1/meeting/manager/meetingList', { params }) // 评审会议列表
export const meetingBasicInfo = meetingId => http.get(`/api/v1/meeting/basicInfo/${meetingId}`) // 会议详情-基本信息
diff --git a/src/pages/expertManage/reviewMeeting/addMeeting/components/RefillDialog.vue b/src/pages/expertManage/reviewMeeting/addMeeting/components/RefillDialog.vue
index 46e38ed..33ecdbf 100644
--- a/src/pages/expertManage/reviewMeeting/addMeeting/components/RefillDialog.vue
+++ b/src/pages/expertManage/reviewMeeting/addMeeting/components/RefillDialog.vue
@@ -13,7 +13,7 @@
label="抽取规则"
>
@@ -24,7 +24,7 @@
type="danger"
plain
icon="Delete"
- :disabled="ExtractionRule.length === 1"
+ :disabled="ruleForm.expertInviteRule.randomRules.length === 1"
@click="delExtractionRule(index)"
>
删除规则
@@ -75,7 +75,7 @@
@@ -182,24 +182,24 @@
@@ -215,10 +215,12 @@
+
+ 测试
diff --git a/src/pages/expertManage/reviewMeeting/addMeeting/index.vue b/src/pages/expertManage/reviewMeeting/addMeeting/index.vue
index 13e1cf5..f4a708b 100644
--- a/src/pages/expertManage/reviewMeeting/addMeeting/index.vue
+++ b/src/pages/expertManage/reviewMeeting/addMeeting/index.vue
@@ -270,25 +270,24 @@ const { proxy } = getCurrentInstance(),
ruleFormClone.meetingBasicInfo.times = undefined
loading.value = true
- // const res = await randomInviteExpect(ruleFormClone)
- // const total = ruleFormClone.expertInviteRule.randomRules.reduce((accumulator, currentItem) => {
- // return accumulator + currentItem.count
- // }, 0)
- // console.log(total)
- // if (res.data.canInvite < total) {
- // ElMessageBox.confirm('当前可邀请专家数量不足,是否继续邀请?', '提示', {
- // confirmButtonText: '确定',
- // cancelButtonText: '取消',
- // type: 'warning'
- // }).then(() => {
- // // 继续邀请
- // console.log('继续')
- // addMetting(ruleFormClone)
- // })
- // } else {
- // await addMetting(ruleFormClone)
- // }
- await addMetting(ruleFormClone)
+ const res = await randomInviteExpect(ruleFormClone)
+ const total = ruleFormClone.expertInviteRule.randomRules.reduce((accumulator, currentItem) => {
+ return accumulator + currentItem.count
+ }, 0)
+ console.log(total)
+ if (res.data.canInvite < total) {
+ ElMessageBox.confirm('当前可邀请专家数量不足,是否继续邀请?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ // 继续邀请
+ console.log('继续')
+ addMetting(ruleFormClone)
+ })
+ } else {
+ await addMetting(ruleFormClone)
+ }
} else {
console.log('error submit!', fields)
}
diff --git a/src/pages/expertManage/reviewMeeting/meetingDetail/index.vue b/src/pages/expertManage/reviewMeeting/meetingDetail/index.vue
index 4e5f232..25781e1 100644
--- a/src/pages/expertManage/reviewMeeting/meetingDetail/index.vue
+++ b/src/pages/expertManage/reviewMeeting/meetingDetail/index.vue
@@ -448,11 +448,11 @@ onMounted(async () => {
const res = await districtList()
regionTree.value.push(res.data)
})
-// import RefillDialog from '@/pages/expertManage/reviewMeeting/addMeeting/components/RefillDialog.vue'
+import RefillDialog from '@/pages/expertManage/reviewMeeting/addMeeting/components/RefillDialogCopy.vue'
-
+