Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b4ba1043
authored
Dec 01, 2023
by
owen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eslint
parent
08be3595
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
34 additions
and
17 deletions
+34
-17
src/api/infra/demo/demo01/index.ts
+0
-0
src/api/infra/demo/demo02/index.ts
+0
-0
src/api/infra/demo/demo03/erp/index.ts
+0
-0
src/api/infra/demo/demo03/inner/index.ts
+6
-2
src/api/infra/demo/demo03/normal/index.ts
+6
-2
src/components/RouterSearch/index.vue
+7
-2
src/layout/components/ToolHeader.vue
+1
-1
src/views/crm/businessStatusType/index.vue
+1
-1
src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
+2
-2
src/views/infra/codegen/EditTable.vue
+5
-1
src/views/infra/demo/demo01/Demo01ContactForm.vue
+0
-0
src/views/infra/demo/demo02/Demo02CategoryForm.vue
+0
-0
src/views/infra/demo/demo03/erp/Demo03StudentForm.vue
+0
-0
src/views/infra/demo/demo03/erp/components/Demo03CourseForm.vue
+0
-0
src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
+0
-0
src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue
+0
-0
src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
+0
-0
src/views/infra/demo/demo03/inner/Demo03StudentForm.vue
+0
-0
src/views/infra/demo/demo03/inner/components/Demo03CourseForm.vue
+1
-1
src/views/infra/demo/demo03/inner/components/Demo03CourseList.vue
+0
-0
src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue
+2
-2
src/views/infra/demo/demo03/inner/components/Demo03GradeList.vue
+0
-0
src/views/infra/demo/demo03/normal/Demo03StudentForm.vue
+0
-0
src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue
+1
-1
src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue
+2
-2
No files found.
src/api/infra/demo/demo01/index.ts
View file @
b4ba1043
src/api/infra/demo/demo02/index.ts
View file @
b4ba1043
src/api/infra/demo/demo03/erp/index.ts
View file @
b4ba1043
src/api/infra/demo/demo03/inner/index.ts
View file @
b4ba1043
...
...
@@ -42,12 +42,16 @@ export const exportDemo03Student = async (params) => {
// 获得学生课程列表
export
const
getDemo03CourseListByStudentId
=
async
(
studentId
)
=>
{
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-course/list-by-student-id?studentId=`
+
studentId
})
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-course/list-by-student-id?studentId=`
+
studentId
})
}
// ==================== 子表(学生班级) ====================
// 获得学生班级
export
const
getDemo03GradeByStudentId
=
async
(
studentId
)
=>
{
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-grade/get-by-student-id?studentId=`
+
studentId
})
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-grade/get-by-student-id?studentId=`
+
studentId
})
}
src/api/infra/demo/demo03/normal/index.ts
View file @
b4ba1043
...
...
@@ -42,12 +42,16 @@ export const exportDemo03Student = async (params) => {
// 获得学生课程列表
export
const
getDemo03CourseListByStudentId
=
async
(
studentId
)
=>
{
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-course/list-by-student-id?studentId=`
+
studentId
})
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-course/list-by-student-id?studentId=`
+
studentId
})
}
// ==================== 子表(学生班级) ====================
// 获得学生班级
export
const
getDemo03GradeByStudentId
=
async
(
studentId
)
=>
{
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-grade/get-by-student-id?studentId=`
+
studentId
})
return
await
request
.
get
({
url
:
`/infra/demo03-student/demo03-grade/get-by-student-id?studentId=`
+
studentId
})
}
src/components/RouterSearch/index.vue
View file @
b4ba1043
...
...
@@ -29,7 +29,12 @@
:class=
"showTopSearch ? 'w-220px ml2' : 'w-0'"
@
change=
"handleChange"
>
<el-option
v-for=
"item in options"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
<el-option
v-for=
"item in options"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</div>
</
template
>
...
...
@@ -73,7 +78,7 @@ function remoteMethod(data) {
function
handleChange
(
path
)
{
router
.
push
({
path
})
hiddenTopSearch
()
;
hiddenTopSearch
()
}
function
hiddenTopSearch
()
{
...
...
src/layout/components/ToolHeader.vue
View file @
b4ba1043
...
...
@@ -65,7 +65,7 @@ export default defineComponent({
{
screenfull
.
value
?
(
<
Screenfull
class
=
"custom-hover"
color
=
"var(--top-header-text-color)"
><
/Screenfull
>
)
:
undefined
}
{
search
.
value
?
(
<
RouterSearch
isModal
=
{
false
}
/>
)
: undefined
}
{
search
.
value
?
<
RouterSearch
isModal
=
{
false
}
/>
: undefined
}
{
size
.
value
?
(
<
SizeDropdown
class
=
"custom-hover"
color
=
"var(--top-header-text-color)"
><
/SizeDropdown
>
)
:
undefined
}
...
...
src/views/crm/businessStatusType/index.vue
View file @
b4ba1043
...
...
@@ -95,7 +95,7 @@ const list = ref([]) // 列表的数据
const
total
=
ref
(
0
)
// 列表的总页数
const
queryParams
=
reactive
({
pageNo
:
1
,
pageSize
:
10
,
pageSize
:
10
})
const
queryFormRef
=
ref
()
// 搜索的表单
const
exportLoading
=
ref
(
false
)
// 导出的加载中
...
...
src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
View file @
b4ba1043
...
...
@@ -12,9 +12,9 @@
v-model=
"formData.userIds"
:data=
"userTree"
:props=
"defaultProps"
check-on-click-node
multiple
filterable
check-on-click-node
node-key=
"id"
placeholder=
"请选择规则适用人群"
/>
...
...
@@ -25,8 +25,8 @@
:data=
"deptTree"
:props=
"defaultProps"
multiple
check-strictly
filterable
check-strictly
node-key=
"id"
placeholder=
"请选择规则适用部门"
/>
...
...
src/views/infra/codegen/EditTable.vue
View file @
b4ba1043
...
...
@@ -8,7 +8,11 @@
<colum-info-form
ref=
"columInfoRef"
:columns=
"formData.columns"
/>
</el-tab-pane>
<el-tab-pane
label=
"生成信息"
name=
"generateInfo"
>
<generate-info-form
ref=
"generateInfoRef"
:table=
"formData.table"
:columns=
"formData.columns"
/>
<generate-info-form
ref=
"generateInfoRef"
:table=
"formData.table"
:columns=
"formData.columns"
/>
</el-tab-pane>
</el-tabs>
<el-form>
...
...
src/views/infra/demo/demo01/Demo01ContactForm.vue
View file @
b4ba1043
src/views/infra/demo/demo02/Demo02CategoryForm.vue
View file @
b4ba1043
src/views/infra/demo/demo03/erp/Demo03StudentForm.vue
View file @
b4ba1043
src/views/infra/demo/demo03/erp/components/Demo03CourseForm.vue
View file @
b4ba1043
src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
View file @
b4ba1043
src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue
View file @
b4ba1043
src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
View file @
b4ba1043
src/views/infra/demo/demo03/inner/Demo03StudentForm.vue
View file @
b4ba1043
src/views/infra/demo/demo03/inner/components/Demo03CourseForm.vue
View file @
b4ba1043
...
...
@@ -57,7 +57,7 @@ watch(
formData
.
value
=
[]
// 2. val 非空,则加载数据
if
(
!
val
)
{
return
;
return
}
try
{
formLoading
.
value
=
true
...
...
src/views/infra/demo/demo03/inner/components/Demo03CourseList.vue
View file @
b4ba1043
src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue
View file @
b4ba1043
...
...
@@ -38,11 +38,11 @@ watch(
id
:
undefined
,
studentId
:
undefined
,
name
:
undefined
,
teacher
:
undefined
,
teacher
:
undefined
}
// 2. val 非空,则加载数据
if
(
!
val
)
{
return
;
return
}
try
{
formLoading
.
value
=
true
...
...
src/views/infra/demo/demo03/inner/components/Demo03GradeList.vue
View file @
b4ba1043
src/views/infra/demo/demo03/normal/Demo03StudentForm.vue
View file @
b4ba1043
src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue
View file @
b4ba1043
...
...
@@ -57,7 +57,7 @@ watch(
formData
.
value
=
[]
// 2. val 非空,则加载数据
if
(
!
val
)
{
return
;
return
}
try
{
formLoading
.
value
=
true
...
...
src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue
View file @
b4ba1043
...
...
@@ -38,11 +38,11 @@ watch(
id
:
undefined
,
studentId
:
undefined
,
name
:
undefined
,
teacher
:
undefined
,
teacher
:
undefined
}
// 2. val 非空,则加载数据
if
(
!
val
)
{
return
;
return
}
try
{
formLoading
.
value
=
true
...
...
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