Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
132415c8
Commit
132415c8
authored
Aug 16, 2023
by
duxingshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、领用台账修改领用人返回的数据类型
2、产品分类-判断当前是否添加一级分类,更新分类列表
parent
6d04da99
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
16 deletions
+7
-16
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
+3
-8
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
+4
-8
No files found.
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
View file @
132415c8
...
...
@@ -211,7 +211,6 @@ export default {
handleAdd
(
row
)
{
this
.
reset
();
this
.
open
=
true
;
this
.
getList
();
if
(
row
!=
null
&&
row
.
id
)
{
console
.
log
(
'row'
,
row
);
this
.
postForm
.
parentId
=
row
.
id
;
...
...
@@ -219,7 +218,6 @@ export default {
this
.
postForm
.
parentId
=
undefined
;
}
this
.
title
=
"新增"
;
},
/** 转换数据结构 */
normalizer
(
node
)
{
...
...
@@ -286,15 +284,12 @@ export default {
});
}
else
{
addProduct
(
this
.
postForm
).
then
(
response
=>
{
console
.
log
(
'this.postForm'
,
this
.
postForm
);
// if (this.postForm.parentId === 0) {
// console.log(1111, this.postForm.parentId);
// }
if
(
this
.
postForm
.
parentId
==
undefined
)
{
this
.
enuqLeader
();
}
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
this
.
getList
();
this
.
enuqLeader
();
});
}
...
...
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
View file @
132415c8
...
...
@@ -70,8 +70,9 @@
<el-col
:span=
"12"
>
<el-form-item
label=
"领用人"
prop=
"recipientById"
>
<el-select
v-model=
"collectionForm.recipientById"
filterable
placeholder=
"请选择领用人"
clearable
style=
"width: 100%;"
:disabled=
"nowType == 2 ? true : false"
>
<el-option
v-for=
"(item, index) in userListly"
:key=
"index"
:label=
"item.userName"
:value=
"item.userId"
>
class=
"selectWidth"
:disabled=
"nowType == 2 ? true : false"
>
<el-option
v-for=
"(item, index) in userListly"
:key=
"index"
:label=
"item.userName"
:value=
"item.userId"
>
</el-option>
</el-select>
</el-form-item>
...
...
@@ -190,8 +191,6 @@ export default {
yjuseTime
:
''
,
sjuseTime
:
''
,
remark
:
''
,
},
dialogVisible
:
false
,
nowType
:
0
,
// 0新增、1编辑、2查看
...
...
@@ -221,10 +220,7 @@ export default {
{
required
:
true
,
message
:
"实际使用时间不能为空"
,
trigger
:
"blur"
}
]
},
dialogVisible
:
false
,
isEditable
:
true
,
}
},
created
()
{
...
...
@@ -270,12 +266,12 @@ export default {
const
id
=
item
.
id
;
queryReceive
(
id
).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
console
.
log
(
res
.
data
);
Object
.
keys
(
this
.
collectionForm
).
forEach
(
key
=>
{
if
(
res
.
data
[
key
])
{
this
.
$set
(
this
.
collectionForm
,
key
,
res
.
data
[
key
]);
}
});
this
.
collectionForm
.
recipientById
=
Number
(
this
.
collectionForm
.
recipientById
)
}
})
...
...
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