kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2021-12-31 16:45:56 +08:00
parent 2fee0695a1 5d2c90bbab
commit 1020513f13
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/3.0.0/AppMeetingChinaunion/components/add.vue vendored
View File

@@ -69,10 +69,10 @@
<el-form-item label="会议说明：" prop="meetingDescription" calss="uedtor" style="margin-top: 16px;"> <el-form-item label="会议说明：" prop="meetingDescription" calss="uedtor" style="margin-top: 16px;">
<ai-editor v-model="form.meetingDescription" :instance="instance"/> <ai-editor v-model="form.meetingDescription" :instance="instance"/>
</el-form-item> </el-form-item>
<el-form-item label="附件："> <!-- <el-form-item label="附件：">-->
<ai-uploader :instance="instance" v-model="form.fileList" fileType="file" <!-- <ai-uploader :instance="instance" v-model="form.fileList" fileType="file"-->
:limit="9"></ai-uploader> <!-- :limit="9"></ai-uploader>-->
</el-form-item> <!-- </el-form-item>-->
<ai-title title="人员设置" isShowBottomBorder/> <ai-title title="人员设置" isShowBottomBorder/>
<div class="person"> <div class="person">
<el-form-item label="与会人员：" prop="participantList" label-width="106px" ref="participantList"> <el-form-item label="与会人员：" prop="participantList" label-width="106px" ref="participantList">

7
packages/wechat/AppAddressBook/components/List.vue
View File

@@ -299,9 +299,12 @@ export default {
nodeContextmenu(e, node) { nodeContextmenu(e, node) {
this.isShowMenu = true this.isShowMenu = true
let y = e.y + 6
if (y + 202 > document.body.clientHeight) {
y = y - 202
}
this.menuInfo = { this.menuInfo = {
x: e.x + 16, x: e.x + 16, y,
y: e.y + 6,
node node
} }
}, },