Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xxx_phase2_web
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏敏伟
xxx_phase2_web
Commits
3332a286
Commit
3332a286
authored
Jul 04, 2024
by
高飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改评审新增弹框样式。信息制品文档列表按钮无法查询问题
parent
45b90741
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
102 additions
and
54 deletions
+102
-54
src/view/fzjc/wjfx.vue
src/view/fzjc/wjfx.vue
+1
-1
src/view/sjgl/wxk_public.vue
src/view/sjgl/wxk_public.vue
+101
-53
No files found.
src/view/fzjc/wjfx.vue
View file @
3332a286
...
@@ -166,7 +166,7 @@ export default {
...
@@ -166,7 +166,7 @@ export default {
this
.
$refs
.
tree
.
setCurrentKey
(
4
);
this
.
$refs
.
tree
.
setCurrentKey
(
4
);
});
});
this
.
currentRole
=
"
navs
"
;
this
.
currentRole
=
"
navs
"
;
this
.
clientDetails
=
{
type
:
[
4
]
};
this
.
clientDetails
=
{
type
:
[]
};
this
.
expandedArr
=
[
4
];
this
.
expandedArr
=
[
4
];
this
.
checkList
=
[];
this
.
checkList
=
[];
this
.
$refs
.
tree
.
setCheckedKeys
([]);
this
.
$refs
.
tree
.
setCheckedKeys
([]);
...
...
src/view/sjgl/wxk_public.vue
View file @
3332a286
...
@@ -254,8 +254,9 @@
...
@@ -254,8 +254,9 @@
</span>
</span>
</el-dialog>
</el-dialog>
<el-dialog
v-if=
"Visible_PsxzAdd"
title=
"评审新增"
:visible.sync=
"Visible_PsxzAdd"
width=
"
3
0%"
<el-dialog
v-if=
"Visible_PsxzAdd"
title=
"评审新增"
:visible.sync=
"Visible_PsxzAdd"
width=
"
6
0%"
center
class=
"xzwd psxz"
>
center
class=
"xzwd psxz"
>
<div
style=
"width: 50%;"
>
<el-form
:model=
"form_PsxzAdd"
label-width=
"80px"
style=
"margin-bottom: 0px"
ref=
"formsPsxz"
:rules=
"rulesPsxz"
>
<el-form
:model=
"form_PsxzAdd"
label-width=
"80px"
style=
"margin-bottom: 0px"
ref=
"formsPsxz"
:rules=
"rulesPsxz"
>
<el-form-item
label=
"文档名称"
prop=
"name"
>
<el-form-item
label=
"文档名称"
prop=
"name"
>
<el-input
v-model=
"form_PsxzAdd.name"
maxlength=
"20"
show-word-limit
placeholder=
"请输入文档名称"
></el-input>
<el-input
v-model=
"form_PsxzAdd.name"
maxlength=
"20"
show-word-limit
placeholder=
"请输入文档名称"
></el-input>
...
@@ -295,10 +296,20 @@
...
@@ -295,10 +296,20 @@
:on-remove=
"handleRemovePsxzExcel"
accept=
"['.XLS','.XLSX']"
>
:on-remove=
"handleRemovePsxzExcel"
accept=
"['.XLS','.XLSX']"
>
<el-button
slot=
"trigger"
size=
"small"
type=
"primary"
>
选取文件
</el-button>
<el-button
slot=
"trigger"
size=
"small"
type=
"primary"
>
选取文件
</el-button>
<div
slot=
"tip"
class=
"el-upload__tip"
>
<div
slot=
"tip"
class=
"el-upload__tip"
>
只允许上传
XLSX文件
只允许选择
XLSX文件
</div>
</div>
</el-upload>
</el-upload>
</el-form-item>
</el-form-item>
<!-- <el-form-item label="选择目录">
<el-tree class="myTree" :data="psxz_tree_data" node-key="id" show-checkbox :expand-on-click-node="false"
highlight-current :props="defaultProps" :check-strictly="true" ref="treePsxz"
:default-expanded-keys="psxzIds" @check-change="handleCheckChangePsxz" :indent=1>
</el-tree>
</el-form-item> -->
</el-form>
</div>
<div
style=
"width: 50%;"
>
<el-form
label-width=
"80px"
style=
"margin-bottom: 0px"
ref=
"formsPsxz1"
>
<el-form-item
label=
"选择目录"
>
<el-form-item
label=
"选择目录"
>
<el-tree
class=
"myTree"
:data=
"psxz_tree_data"
node-key=
"id"
show-checkbox
:expand-on-click-node=
"false"
<el-tree
class=
"myTree"
:data=
"psxz_tree_data"
node-key=
"id"
show-checkbox
:expand-on-click-node=
"false"
highlight-current
:props=
"defaultProps"
:check-strictly=
"true"
ref=
"treePsxz"
highlight-current
:props=
"defaultProps"
:check-strictly=
"true"
ref=
"treePsxz"
...
@@ -306,6 +317,7 @@
...
@@ -306,6 +317,7 @@
</el-tree>
</el-tree>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"Visible_PsxzAdd = false"
>
取 消
</el-button>
<el-button
@
click=
"Visible_PsxzAdd = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"submitPsxz"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"submitPsxz"
>
确 定
</el-button>
...
@@ -1111,6 +1123,25 @@ export default {
...
@@ -1111,6 +1123,25 @@ export default {
});
});
return
;
return
;
}
else
{
}
else
{
let
str
=
''
;
this
.
psxzIds
=
[
this
.
psxz_tree_data
[
0
].
id
];
if
(
this
.
psxz_tree_data
.
length
>
0
){
if
(
this
.
psxz_tree_data
[
0
].
children
.
length
>
0
){
str
=
str
+
this
.
zjdsfxz
(
'
产品类别代码
'
);
str
=
str
+
this
.
zjdsfxz
(
'
年份代码
'
);
str
=
str
+
this
.
zjdsfxz
(
'
单位名称代码
'
);
str
=
str
+
this
.
zjdsfxz
(
'
产品类型代码
'
);
}
}
if
(
str
!=
''
){
let
mesg
=
str
.
replace
(
/
\n
/g
,
'
<br />
'
);
this
.
$message
({
type
:
'
warning
'
,
dangerouslyUseHTMLString
:
true
,
message
:
mesg
});
}
else
{
let
file_ext
=
this
.
form_PsxzAdd
.
fileList
[
0
].
name
.
substring
(
let
file_ext
=
this
.
form_PsxzAdd
.
fileList
[
0
].
name
.
substring
(
lastIndexOf
(
this
.
form_PsxzAdd
.
fileList
[
0
].
name
,
"
.
"
)
+
1
,
lastIndexOf
(
this
.
form_PsxzAdd
.
fileList
[
0
].
name
,
"
.
"
)
+
1
,
this
.
form_PsxzAdd
.
fileList
[
0
].
name
.
length
this
.
form_PsxzAdd
.
fileList
[
0
].
name
.
length
...
@@ -1190,6 +1221,7 @@ export default {
...
@@ -1190,6 +1221,7 @@ export default {
});
});
}
}
}
}
}
});
});
},
},
haveSameElements
(
arr1
,
arr2
)
{
haveSameElements
(
arr1
,
arr2
)
{
...
@@ -1332,7 +1364,7 @@ export default {
...
@@ -1332,7 +1364,7 @@ export default {
arrId
.
push
(
i
.
id
);
arrId
.
push
(
i
.
id
);
})
})
if
(
!
this
.
haveSameElements
(
this
.
clientDetails_check_typePsxz
,
arrId
)){
if
(
!
this
.
haveSameElements
(
this
.
clientDetails_check_typePsxz
,
arrId
)){
str
=
str
+
'
“
'
+
name
+
'
”子节点
没有选中
\n
'
;
str
=
str
+
'
“
'
+
name
+
'
”子节点
未匹配
\n
'
;
this
.
psxzIds
.
push
(
zjArr
[
0
].
id
);
this
.
psxzIds
.
push
(
zjArr
[
0
].
id
);
}
}
}
}
...
@@ -1537,6 +1569,8 @@ export default {
...
@@ -1537,6 +1569,8 @@ export default {
ms
:
""
,
ms
:
""
,
gjc
:
""
,
gjc
:
""
,
};
};
this
.
psxzIds
=
[
this
.
psxz_tree_data
[
0
].
id
];
this
.
psxz_tree_data
=
this
.
initData
(
this
.
deepClone
(
this
.
psxz_tree_dataCopy
));
}
}
},
},
//视频预览弹出框隐藏事件
//视频预览弹出框隐藏事件
...
@@ -2059,7 +2093,6 @@ export default {
...
@@ -2059,7 +2093,6 @@ export default {
.myTree
>
.el-tree-node
>
.el-tree-node__content
.el-checkbox
{
.myTree
>
.el-tree-node
>
.el-tree-node__content
.el-checkbox
{
display
:
none
;
display
:
none
;
}
}
.el-tree
{
.el-tree
{
color
:
white
;
color
:
white
;
background
:
transparent
;
background
:
transparent
;
...
@@ -2145,6 +2178,21 @@ export default {
...
@@ -2145,6 +2178,21 @@ export default {
}
}
}
}
}
}
.psxz
{
.el-tree
{
margin-top
:
0px
;
}
.el-dialog__body
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
flex-start
;
gap
:
20px
;
}
.el-tree
>
.el-tree-node
>
.el-tree-node__children
{
height
:
380px
;
overflow
:
auto
!
important
;
}
}
.el-tree
>
.el-tree-node
>
.el-tree-node__content
{
.el-tree
>
.el-tree-node
>
.el-tree-node__content
{
height
:
40px
;
height
:
40px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment