Skip to content

X
xxx_phase2_web
Commit 274c0a80 authored by 以墨为白's avatar 以墨为白 🎧
Browse files
Options

Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

parents 4bfe476d 6ca7a8c3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/view/ddkz/components/chatRoomMemberDialog.vue
View file @ 274c0a80
...@@ -139,6 +139,7 @@ export default { ...@@ -139,6 +139,7 @@ export default {
.personInfo-content { .personInfo-content {
width: 100%; width: 100%;
height: calc(100% - 50px); height: calc(100% - 50px);
overflow-y: auto;
.everyTeam { .everyTeam {
width: calc(33% - 10px); width: calc(33% - 10px);
......
src/view/dfzy/dfzyrwk.vue
View file @ 274c0a80
...@@ -377,7 +377,7 @@ export default { ...@@ -377,7 +377,7 @@ export default {
module: this.types == 1 ? "DF" : "DFWW", module: this.types == 1 ? "DF" : "DFWW",
combinationSearch:{ combinationSearch:{
chineseName: this.formInline.name, chineseName: this.formInline.name,
foreignName: this.formInline.jc, foreignName: this.formInline.wwm,
xzzw: this.formInline.xzzw, xzzw: this.formInline.xzzw,
rwjj: this.formInline.rwjj, rwjj: this.formInline.rwjj,
bq: this.formInline.bq, bq: this.formInline.bq,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment