Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
admin
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
华润手术跟台
admin
Commits
d43b68e0
提交
d43b68e0
authored
11月 10, 2022
作者:
袁伟伟
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
http://git.xinwangdao.com/china-resources-surgical/admin
上级
e99dea1e
dad05225
全部展开
显示空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
253 行增加
和
132 行删除
+253
-132
batchOrder.ts
src/api/model/batchOrder.ts
+24
-0
batchOrderApi.ts
src/api/order/batchOrderApi.ts
+11
-26
distributorApi.ts
src/api/system/distributorApi.ts
+15
-11
userApi.ts
src/api/system/userApi.ts
+1
-2
formRules.ts
src/commonSchemaProperty/formRules.ts
+4
-9
index.ts
src/commonSchemaProperty/index.ts
+2
-1
StrengthMeter.vue
src/components/StrengthMeter/src/StrengthMeter.vue
+1
-0
LoginForm.vue
src/views/common/login/LoginForm.vue
+5
-5
RegisterForm.vue
src/views/common/login/RegisterForm.vue
+97
-44
detail.vue
src/views/order/batch-order/detail.vue
+25
-19
drawer.vue
src/views/order/batch-order/drawer.vue
+35
-3
index.vue
src/views/order/batch-order/index.vue
+25
-10
schema.ts
src/views/order/batch-order/schema.ts
+0
-0
enum.ts
src/views/system/distributor/enum.ts
+6
-0
schema.ts
src/views/system/distributor/schema.ts
+2
-2
没有找到文件。
src/api/model/batchOrder.ts
浏览文件 @
d43b68e0
...
...
@@ -63,10 +63,26 @@ export interface BatchOrderParams extends BasePageParams {
* 收货地址
*/
address
?:
string
;
/**
* 工单状态
*/
status
?:
String
;
/**
* 工单状态 IN值List
*/
statusList
?:
Array
<
string
>
;
/**
* 备注
*/
remark
?:
string
;
/**
* 是否是主订单
*/
type
?:
String
;
/**
* 是否是主订单 IN值List
*/
typeList
?:
Array
<
string
>
;
/**
* 是否删除
*/
...
...
@@ -170,10 +186,18 @@ export interface BatchOrder {
* 收货地址
*/
address
?:
string
;
/**
* 工单状态
*/
status
?:
String
;
/**
* 备注
*/
remark
?:
string
;
/**
* 是否是主订单
*/
type
?:
String
;
/**
* 是否删除
*/
...
...
src/api/order/batchOrderApi.ts
浏览文件 @
d43b68e0
...
...
@@ -5,81 +5,66 @@
*/
import
{
defHttp
}
from
'/@/utils/http/axios'
;
import
{
ApiResponse
}
from
'../model/baseModel'
;
import
{
BatchOrder
,
BatchOrderParams
,
BatchOrderPageResult
,
BatchOrderPageResponse
,
BatchOrderResponse
,
}
from
'../model/batchOrder'
;
const
baseApi
=
'/v1/order/batch-order'
;
/**
* 新增
*/
export
const
add
=
(
entity
:
BatchOrder
)
=>
defHttp
.
post
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/`
,
data
:
entity
});
export
const
add
=
(
entity
:
BatchOrder
)
=>
defHttp
.
post
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/`
,
data
:
entity
});
/**
* 更新
*/
export
const
update
=
(
entity
:
BatchOrder
)
=>
defHttp
.
put
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/`
,
data
:
entity
});
export
const
update
=
(
entity
:
BatchOrder
)
=>
defHttp
.
put
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/`
,
data
:
entity
});
/**
* 删除
*/
export
const
remove
=
(
id
:
any
)
=>
defHttp
.
delete
<
Number
>
({
url
:
`
${
baseApi
}
/
${
id
}
`
});
export
const
remove
=
(
id
:
any
)
=>
defHttp
.
delete
<
Number
>
({
url
:
`
${
baseApi
}
/
${
id
}
`
});
/**
* 分页查询
*/
export
const
search
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
BatchOrderPageResult
>
({
url
:
`
${
baseApi
}
/search`
,
params
});
export
const
search
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
BatchOrderPageResult
>
({
url
:
`
${
baseApi
}
/search`
,
params
});
/**
* 列表查询
*/
export
const
all
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
BatchOrderPageResult
>
({
url
:
`
${
baseApi
}
/all`
,
params
});
export
const
all
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
BatchOrderPageResult
>
({
url
:
`
${
baseApi
}
/all`
,
params
});
/**
* 通过主键查询
*/
export
const
getById
=
(
id
:
any
)
=>
defHttp
.
get
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/
${
id
}
`
});
export
const
getById
=
(
id
:
any
)
=>
defHttp
.
get
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/
${
id
}
`
});
/**
* 单个查询
*/
export
const
getOne
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/one`
,
params
});
export
const
getOne
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
BatchOrder
>
({
url
:
`
${
baseApi
}
/one`
,
params
});
/**
* 批量删除
*/
export
const
batchRemove
=
(
idList
:
Array
<
any
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-delete`
,
data
:
idList
});
export
const
batchRemove
=
(
idList
:
Array
<
any
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-delete`
,
data
:
idList
});
/**
* 批量新增
*/
export
const
batchAdd
=
(
entityList
:
Array
<
BatchOrder
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-save`
,
data
:
entityList
});
export
const
batchAdd
=
(
entityList
:
Array
<
BatchOrder
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-save`
,
data
:
entityList
});
/**
* 批量更新
*/
export
const
batchUpdate
=
(
entityList
:
Array
<
BatchOrder
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-update`
,
data
:
entityList
});
export
const
batchUpdate
=
(
entityList
:
Array
<
BatchOrder
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-update`
,
data
:
entityList
});
/**
* 查询数量
*/
export
const
count
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
Number
>
({
url
:
`
${
baseApi
}
/count`
,
params
});
export
const
count
=
(
params
?:
BatchOrderParams
)
=>
defHttp
.
get
<
Number
>
({
url
:
`
${
baseApi
}
/count`
,
params
});
src/api/system/distributorApi.ts
浏览文件 @
d43b68e0
...
...
@@ -5,11 +5,7 @@
*/
import
{
defHttp
}
from
'/@/utils/http/axios'
;
import
{
Distributor
,
DistributorParams
,
DistributorPageResult
,
}
from
'../model/distributor'
;
import
{
Distributor
,
DistributorParams
,
DistributorPageResult
}
from
'../model/distributor'
;
const
baseApi
=
'/v1/system/distributor'
;
/**
...
...
@@ -30,12 +26,13 @@ export const remove = (id: any) => defHttp.delete<Number>({ url: `${baseApi}/${i
/**
* 分页查询
*/
export
const
search
=
(
params
?:
DistributorParams
)
=>
defHttp
.
get
<
DistributorPageResult
>
({
url
:
`
${
baseApi
}
/search`
,
params
});
export
const
search
=
(
params
?:
DistributorParams
)
=>
defHttp
.
get
<
DistributorPageResult
>
({
url
:
`
${
baseApi
}
/search`
,
params
});
/**
* 列表查询
*/
export
const
all
=
(
params
?:
DistributorParams
)
=>
defHttp
.
get
<
Distributor
PageResult
>
({
url
:
`
${
baseApi
}
/all`
,
params
});
export
const
all
=
(
params
?:
DistributorParams
)
=>
defHttp
.
get
<
Distributor
[]
>
({
url
:
`
${
baseApi
}
/all`
,
params
});
/**
* 通过主键查询
...
...
@@ -50,21 +47,28 @@ export const getOne = (params?: DistributorParams) => defHttp.get<Distributor>({
/**
* 批量删除
*/
export
const
batchRemove
=
(
idList
:
Array
<
any
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-delete`
,
data
:
idList
});
export
const
batchRemove
=
(
idList
:
Array
<
any
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-delete`
,
data
:
idList
});
/**
* 批量新增
*/
export
const
batchAdd
=
(
entityList
:
Array
<
Distributor
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-save`
,
data
:
entityList
});
export
const
batchAdd
=
(
entityList
:
Array
<
Distributor
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-save`
,
data
:
entityList
});
/**
* 批量更新
*/
export
const
batchUpdate
=
(
entityList
:
Array
<
Distributor
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-update`
,
data
:
entityList
});
export
const
batchUpdate
=
(
entityList
:
Array
<
Distributor
>
)
=>
defHttp
.
post
<
boolean
>
({
url
:
`
${
baseApi
}
/batch-update`
,
data
:
entityList
});
/**
* 查询数量
*/
export
const
count
=
(
params
?:
DistributorParams
)
=>
defHttp
.
get
<
Number
>
({
url
:
`
${
baseApi
}
/count`
,
params
});
/**
* 列表查询
*/
export
const
allWithoutAuth
=
(
params
?:
DistributorParams
)
=>
defHttp
.
get
<
Distributor
[]
>
({
url
:
`
${
baseApi
}
/all/without/auth`
,
params
});
src/api/system/userApi.ts
浏览文件 @
d43b68e0
...
...
@@ -84,8 +84,7 @@ export const logout = () => defHttp.post<any>({ url: `${baseApi}/logout` }, { er
/**
* 用户注册
*/
export
const
register
=
(
user
:
User
)
=>
defHttp
.
post
<
User
>
({
url
:
`
${
baseApi
}
/login`
,
data
:
user
},
{
errorMessageMode
:
'none'
});
export
const
register
=
(
user
:
User
)
=>
defHttp
.
post
<
User
>
({
url
:
`
${
baseApi
}
/register`
,
data
:
user
});
/**
* 当前用户信息
...
...
src/commonSchemaProperty/formRules.ts
浏览文件 @
d43b68e0
interface
ruleParams
{
message
?:
string
;
trigger
?:
string
;
}
export
const
phoneRule
=
(
ruleParam
?:
ruleParams
)
=>
{
const
{
message
=
'请输入正确的手机号码!'
,
trigger
=
'blur'
}
=
ruleParam
||
{};
export
const
phoneRule
=
(
ruleParam
?:
any
)
=>
{
return
{
pattern
:
/^1
[
3456789
]\d{9}
$/
,
message
:
message
,
trigger
:
trigger
,
message
:
'请输入正确的手机号码!'
,
trigger
:
'blur'
,
...
ruleParam
,
};
};
src/commonSchemaProperty/index.ts
浏览文件 @
d43b68e0
...
...
@@ -8,6 +8,7 @@ import * as DoctorApi from '/@/api/system/doctorApi';
import
*
as
UserApi
from
'/@/api/system/userApi'
;
import
{
StatusValEnum
as
DoctorStatusValEnum
}
from
'/@/views/system/doctor/enum'
;
import
{
StatusValEnum
as
UserStatusValEnum
}
from
'/@/views/system/user/enum'
;
import
{
StatusValEnum
as
DistributorValEnum
}
from
'/@/views/system/distributor/enum'
;
import
{
StatusValEnum
as
ReceiverStatusValEnum
}
from
'/@/views/system/receiver/enum'
;
import
{
RoleEnum
}
from
'/@/views/system/role/enum'
;
import
*
as
ThirdApi
from
'/@/api/system/thirdApi'
;
...
...
@@ -38,7 +39,7 @@ const getDistributorId = ({ colProps }) => {
labelInValue
:
true
,
api
:
DistributorApi
.
all
,
params
:
{
status
:
UserStatus
ValEnum
.
PASSED
,
status
:
Distributor
ValEnum
.
PASSED
,
},
resultField
:
'records'
,
labelField
:
'name'
,
...
...
src/components/StrengthMeter/src/StrengthMeter.vue
浏览文件 @
d43b68e0
...
...
@@ -7,6 +7,7 @@
:value=
"innerValueRef"
@
change=
"handleChange"
:disabled=
"disabled"
autocomplete=
"new-password"
>
<template
#[
item
]="
data
"
v-for=
"item in Object.keys($slots)"
>
<slot
:name=
"item"
v-bind=
"data ||
{}">
</slot>
...
...
src/views/common/login/LoginForm.vue
浏览文件 @
d43b68e0
...
...
@@ -38,9 +38,9 @@
<ACol
:span=
"12"
>
<FormItem
:style=
"
{ 'text-align': 'right' }">
<!-- No logic, you need to deal with it yourself -->
<
Button
type=
"link"
size=
"small"
@
click=
"setLoginState(LoginStateEnum.RESET_PASSWORD)"
>
{{
t
(
'sys.login.forgetPassword'
)
}}
<
/Button
>
<
!--
<Button
type=
"link"
size=
"small"
@
click=
"setLoginState(LoginStateEnum.RESET_PASSWORD)"
>
--
>
<!--
{{
t
(
'sys.login.forgetPassword'
)
}}
-->
<
!--
</Button>
--
>
</FormItem>
</ACol>
</ARow>
...
...
@@ -49,9 +49,9 @@
<Button
type=
"primary"
size=
"large"
block
@
click=
"handleLogin"
:loading=
"loading"
>
{{
t
(
'sys.login.loginButton'
)
}}
</Button>
<
!--
<Button
size=
"large"
class=
"mt-4 enter-x"
block
@
click=
"handleRegister
"
>
<
Button
size=
"large"
class=
"mt-4 enter-x"
block
@
click=
"setLoginState(LoginStateEnum.REGISTER)
"
>
{{
t
(
'sys.login.registerButton'
)
}}
</Button>
-->
</Button>
</FormItem>
<!--
<ARow
class=
"enter-x"
>
...
...
src/views/common/login/RegisterForm.vue
浏览文件 @
d43b68e0
...
...
@@ -2,36 +2,37 @@
<template
v-if=
"getShow"
>
<LoginFormTitle
class=
"enter-x"
/>
<Form
class=
"p-4 enter-x"
:model=
"formData"
:rules=
"getFormRules"
ref=
"formRef"
>
<FormItem
name=
"account"
class=
"enter-x"
>
<Input
class=
"fix-auto-fill"
size=
"large"
v-model:value=
"formData.account"
:placeholder=
"t('sys.login.userName')"
/>
<FormItem
name=
"username"
class=
"enter-x"
>
<Input
class=
"fix-auto-fill"
size=
"large"
v-model:value=
"formData.username"
placeholder=
"用户名"
/>
</FormItem>
<FormItem
name=
"mobile"
class=
"enter-x"
>
<Input
<a-spin
:spinning=
"isDistributorOptionsLoading"
>
<FormItem
name=
"distributorId"
class=
"enter-x"
:rules=
"[
{ required: true, message: '请选择经销商!' }]">
<a-select
v-model:value=
"formData.distributorId"
size=
"large"
v-model:value=
"formData.mobile"
:placeholder=
"t('sys.login.mobile')"
class=
"fix-auto-fill"
style=
"width: 100%"
:options=
"distributorOptions"
placeholder=
"请选择经销商"
:show-search=
"true"
:fieldNames=
"
{ label: 'name', value: 'id' }"
:allowClear="false"
optionFilterProp="name"
/>
</FormItem>
<FormItem
name=
"sms"
class=
"enter-x"
>
<CountdownInput
size=
"large"
class=
"fix-auto-fill"
v-model:value=
"formData.sms"
:placeholder=
"t('sys.login.smsCode')"
/>
</a-spin>
<FormItem
name=
"mobile"
class=
"enter-x"
:rules=
"[phoneRule(
{ required: true })]">
<Input
size=
"large"
v-model:value=
"formData.mobile"
placeholder=
"手机号"
class=
"fix-auto-fill"
/>
</FormItem>
<!--
<FormItem
name=
"sms"
class=
"enter-x"
>
-->
<!--
<CountdownInput-->
<!-- size="large"-->
<!-- class="fix-auto-fill"-->
<!-- v-model:value="formData.sms"-->
<!-- :placeholder="t('sys.login.smsCode')"-->
<!-- />-->
<!--
</FormItem>
-->
<FormItem
name=
"password"
class=
"enter-x"
>
<StrengthMeter
size=
"large"
v-model:value=
"formData.password"
:placeholder=
"t('sys.login.password')"
/>
<StrengthMeter
size=
"large"
v-model:value=
"formData.password"
:placeholder=
"t('sys.login.password')"
/>
</FormItem>
<FormItem
name=
"confirmPassword"
class=
"enter-x"
>
<InputPassword
...
...
@@ -42,21 +43,14 @@
/>
</FormItem>
<
FormItem
class=
"enter-x"
name=
"policy"
>
<!-- No logic, you need to deal with it yourself
-->
<Checkbox
v-model:checked=
"formData.policy"
size=
"small"
>
{{
t
(
'sys.login.policy'
)
}}
</Checkbox
>
<
/FormItem
>
<
!--
<FormItem
class=
"enter-x"
name=
"policy"
>
--
>
<!-- <!– No logic, you need to deal with it yourself –>
-->
<!--
<Checkbox
v-model:checked=
"formData.policy"
size=
"small"
>
--
>
<!--
{{
t
(
'sys.login.policy'
)
}}
-->
<!--
</Checkbox>
--
>
<
!--
</FormItem>
--
>
<Button
type=
"primary"
class=
"enter-x"
size=
"large"
block
@
click=
"handleRegister"
:loading=
"loading"
>
<Button
type=
"primary"
class=
"enter-x"
size=
"large"
block
@
click=
"handleRegister"
:loading=
"isRegisterLoading"
>
{{
t
(
'sys.login.registerButton'
)
}}
</Button>
<Button
size=
"large"
block
class=
"mt-4 enter-x"
@
click=
"handleBackLogin"
>
...
...
@@ -66,13 +60,19 @@
</
template
>
</template>
<
script
lang=
"ts"
setup
>
import
{
reactive
,
ref
,
unref
,
computed
}
from
'vue'
;
import
{
notification
}
from
'ant-design-vue'
;
import
{
reactive
,
ref
,
unref
,
computed
,
watch
}
from
'vue'
;
import
LoginFormTitle
from
'./LoginFormTitle.vue'
;
import
{
Form
,
Input
,
Button
,
Checkbox
}
from
'ant-design-vue'
;
import
{
Form
,
Input
,
Button
}
from
'ant-design-vue'
;
import
{
StrengthMeter
}
from
'/@/components/StrengthMeter'
;
import
{
CountdownInput
}
from
'/@/components/CountDown'
;
import
{
useI18n
}
from
'/@/hooks/web/useI18n'
;
import
{
useLoginState
,
useFormRules
,
useFormValid
,
LoginStateEnum
}
from
'./useLogin'
;
import
{
phoneRule
}
from
'/@/commonSchemaProperty/formRules'
;
import
{
useAsyncState
}
from
'@vueuse/core'
;
import
*
as
DistributorApi
from
'/@/api/system/distributorApi'
;
import
*
as
UserApi
from
'/@/api/system/userApi'
;
import
{
StatusValEnum
as
DistributorValEnum
}
from
'/@/views/system/distributor/enum'
;
import
{
Distributor
}
from
'/@/api/model/distributor'
;
const
FormItem
=
Form
.
Item
;
const
InputPassword
=
Input
.
Password
;
...
...
@@ -80,10 +80,10 @@
const
{
handleBackLogin
,
getLoginState
}
=
useLoginState
();
const
formRef
=
ref
();
const
loading
=
ref
(
false
);
const
formData
=
reactive
({
account
:
''
,
distributorId
:
null
,
username
:
''
,
password
:
''
,
confirmPassword
:
''
,
mobile
:
''
,
...
...
@@ -96,9 +96,62 @@
const
getShow
=
computed
(()
=>
unref
(
getLoginState
)
===
LoginStateEnum
.
REGISTER
);
// 查询所有经销商
const
{
state
:
distributorOptions
,
isLoading
:
isDistributorOptionsLoading
,
execute
:
getDistributorOptions
,
}
=
useAsyncState
(
()
=>
{
const
params
=
{
status
:
DistributorValEnum
.
PASSED
,
};
return
DistributorApi
.
allWithoutAuth
(
params
).
then
((
res
:
Distributor
[])
=>
res
);
},
[],
{
immediate
:
false
,
},
);
// 注册页面展示时,查询经销商
watch
(
getShow
,
(
val
)
=>
{
if
(
val
)
{
getDistributorOptions
();
}
});
// 注册
const
{
isLoading
:
isRegisterLoading
,
isReady
:
isRegisterReady
,
execute
:
registerExecute
,
}
=
useAsyncState
(
(
data
)
=>
{
return
UserApi
.
register
(
data
).
then
((
res
:
any
)
=>
res
);
},
[],
{
immediate
:
false
,
},
);
// 注册成功之后
watch
(
isRegisterReady
,
(
val
)
=>
{
if
(
val
)
{
notification
.
success
({
message
:
'注册成功!'
,
description
:
'请等待管理员审核'
,
duration
:
0
,
});
formRef
.
value
.
resetFields
();
handleBackLogin
();
}
});
// 表单提交
async
function
handleRegister
()
{
const
data
=
await
validForm
();
if
(
!
data
)
return
;
console
.
log
(
data
);
await
registerExecute
(
0
,
data
);
}
</
script
>
src/views/order/batch-order/detail.vue
浏览文件 @
d43b68e0
<
template
>
<Card
:bordered=
"false"
>
<Card
:bordered=
"false"
:loading=
"isLoading"
>
<Descriptions
bordered
:column=
"3"
>
<Descriptions
.
Item
v-for=
"p in displayProps"
...
...
@@ -8,7 +8,7 @@
:span=
"['avatar'].includes(p.name) ? 3 : 1"
>
<span
v-if=
"p.key === 'avatar'"
>
<
img
:src=
"p.value"
style=
"width: 120px; height
: 120px"
/>
<
ImagePreview
:imageList=
"[p.value]"
style=
"width
: 120px"
/>
</span>
<template
v-else
>
{{
p
.
value
}}
...
...
@@ -18,39 +18,45 @@
</Card>
</template>
<
script
lang=
"ts"
setup
name=
"DeviceDetail"
>
import
{
onMounted
,
computed
,
ref
,
reactive
}
from
'vue'
;
import
{
onMounted
,
computed
,
ref
}
from
'vue'
;
import
{
useRoute
}
from
'vue-router'
;
import
{
useAsyncState
}
from
'@vueuse/core'
;
import
{
ImagePreview
}
from
'/@/components/Preview/index'
;
import
{
ComputedRef
}
from
'@vue/reactivity'
;
import
{
Descriptions
,
Card
}
from
'ant-design-vue'
;
import
{
descriptionColumns
}
from
'./schema'
;
import
*
as
BatchOrderApi
from
'/@/api/order/batchOrderApi'
;
import
{
Device
}
from
'/@/api/model/device
'
;
import
{
BatchOrder
}
from
'/@/api/model/batchOrder
'
;
const
route
=
useRoute
();
const
id
=
ref
(
route
.
params
?.
id
);
let
data
=
reactive
({
detail
:
{},
isOver
:
false
,
});
const
getDetail
=
()
=>
{
BatchOrderApi
.
getById
(
id
.
value
).
then
((
res
:
Device
)
=>
{
data
.
isOver
=
true
;
data
.
detail
=
res
;
});
};
// id 查询
const
{
state
:
detail
,
isReady
:
isDetailReady
,
isLoading
,
execute
,
}
=
useAsyncState
(
()
=>
{
return
BatchOrderApi
.
getById
(
id
.
value
).
then
((
res
:
BatchOrder
)
=>
res
);
},
null
,
{
immediate
:
false
,
},
);
onMounted
(()
=>
{
getDetail
();
execute
();
});
const
displayProps
:
ComputedRef
<
Array
<
any
>>
=
computed
(()
=>
{
if
(
!
data
.
isOver
)
return
{};
if
(
!
isDetailReady
.
value
)
return
{};
const
display
:
any
=
descriptionColumns
.
map
(({
title
,
dataIndex
=
''
,
customRender
})
=>
({
key
:
dataIndex
,
title
,
value
:
customRender
?
customRender
({
text
:
data
.
detail
[
dataIndex
],
record
:
data
.
detail
})
:
data
.
detail
[
dataIndex
],
value
:
customRender
?
customRender
({
text
:
detail
.
value
[
dataIndex
],
record
:
detail
.
value
})
:
detail
.
value
[
dataIndex
],
}));
return
display
;
});
...
...
src/views/order/batch-order/drawer.vue
浏览文件 @
d43b68e0
<
template
>
<BasicDrawer
v-bind=
"$attrs"
@
register=
"registerDrawer"
showFooter
:title=
"getTitle"
width=
"600px"
@
ok=
"handleSubmit"
>
<BasicDrawer
v-bind=
"$attrs"
@
register=
"registerDrawer"
showFooter
:confirmDisabled=
"getConfirmDisabled"
:title=
"getTitle"
width=
"600px"
@
ok=
"handleSubmit"
>
<a-spin
:spinning=
"isLoading"
>
<BasicForm
@
register=
"registerForm"
/>
</a-spin>
</BasicDrawer>
</
template
>
<
script
lang=
"ts"
setup
name=
"BatchOrderDrawer"
>
...
...
@@ -8,7 +10,9 @@
import
{
BasicForm
,
useForm
}
from
'/@/components/Form/index'
;
import
{
formSchema
}
from
'./schema'
;
import
{
BasicDrawer
,
useDrawerInner
}
from
'/@/components/Drawer'
;
import
{
useAsyncState
}
from
'@vueuse/core'
;
import
*
as
BatchOrderApi
from
'/@/api/order/batchOrderApi'
;
import
{
BatchOrder
}
from
'/@/api/model/batchOrder'
;
const
emit
=
defineEmits
([
'success'
,
'register'
]);
const
isUpdate
=
ref
(
true
);
...
...
@@ -20,6 +24,22 @@
showActionButtonGroup
:
false
,
});
// id 查询
const
{
state
:
detail
,
isReady
:
isDetailReady
,
isLoading
,
execute
,
}
=
useAsyncState
(
()
=>
{
return
BatchOrderApi
.
getById
(
entityId
.
value
).
then
((
res
:
BatchOrder
)
=>
res
);
},
null
,
{
immediate
:
false
,
},
);
const
[
registerDrawer
,
{
setDrawerProps
,
closeDrawer
}]
=
useDrawerInner
(
async
(
data
)
=>
{
await
resetFields
();
setDrawerProps
({
confirmLoading
:
false
});
...
...
@@ -27,9 +47,21 @@
entityId
.
value
=
data
?.
record
?.
id
;
if
(
unref
(
isUpdate
))
{
await
setFieldsValue
({
...
data
.
record
,
await
execute
();
if
(
detail
.
value
)
{
const
formData
:
any
=
{
...
detail
.
value
,
};
await
setFieldsValue
(
formData
);
}
}
});
const
getConfirmDisabled
=
computed
(()
=>
{
if
(
unref
(
isUpdate
))
{
return
!
unref
(
isDetailReady
);
}
else
{
return
false
;
}
});
...
...
src/views/order/batch-order/index.vue
浏览文件 @
d43b68e0
...
...
@@ -8,6 +8,7 @@
<span>
已选中
{{
checkedKeys
.
length
}}
条记录
</span>
<a-button
type=
"link"
@
click=
"checkedKeys = []"
size=
"small"
>
清空
</a-button>
<a-popconfirm
v-auth=
"'AUTH_ORDER_BATCH_ORDER'"
class=
"ml-4"
title=
"确定要全部删除吗?"
ok-text=
"是"
...
...
@@ -27,9 +28,6 @@
<a-button
v-auth=
"'AUTH_ORDER_BATCH_ORDER:ADD'"
type=
"primary"
@
click=
"handleCreate"
>
新增
</a-button>
</
template
>
<
template
#
bodyCell=
"{ column, record, text }"
>
<template
v-if=
"column.dataIndex === 'id'"
>
<a
@
click=
"handleView(record)"
>
{{
record
.
id
}}
</a>
</
template
>
<template
v-if=
"[].includes(column.dataIndex)"
>
<img
:src=
"text"
class=
"photo"
alt=
"图片"
v-if=
"!!text"
/>
</
template
>
...
...
@@ -42,6 +40,12 @@
onClick: handleEdit.bind(null, record),
ifShow: hasPermission('AUTH_ORDER_BATCH_ORDER:EDIT'),
},
{
tooltip: '详情',
icon: 'ant-design:eye-outlined',
onClick: handleView.bind(null, record),
ifShow: hasPermission('AUTH_ORDER_BATCH_ORDER:QUERY'),
},
{
tooltip: '删除',
icon: 'ant-design:delete-outlined',
...
...
@@ -60,7 +64,7 @@
<BatchOrderDrawer
@
register=
"registerDrawer"
@
success=
"handleSuccess"
/>
</div>
</template>
<
script
lang=
"ts"
setup
name=
"
DeviceIndex
"
>
<
script
lang=
"ts"
setup
name=
"
AUTH_ORDER_BATCH_ORDER
"
>
import
{
ref
}
from
'vue'
;
import
{
useGo
}
from
'/@/hooks/web/usePage'
;
import
{
usePermission
}
from
'/@/hooks/web/usePermission'
;
...
...
@@ -75,15 +79,20 @@
const
{
hasPermission
}
=
usePermission
();
const
go
=
useGo
();
const
{
formConfig
,
showTableSetting
,
bordered
,
showIndexColumn
}
=
componentSetting
.
table
;
const
{
formConfig
,
showTableSetting
,
bordered
,
showIndexColumn
,
}
=
componentSetting
.
table
;
const
checkedKeys
=
ref
<
Array
<
string
|
number
>>
([]);
const
onSelectChange
=
(
selectedRowKeys
:
(
string
|
number
)[])
=>
{
checkedKeys
.
value
=
selectedRowKeys
;
}
;
}
const
[
registerDrawer
,
{
openDrawer
}]
=
useDrawer
();
const
[
registerTable
,
{
reload
}]
=
useTable
({
const
[
registerTable
,
{
reload
,
setLoading
}]
=
useTable
({
title
:
'批量订单管理'
,
api
:
(
params
)
=>
BatchOrderApi
.
search
(
handleParams
(
params
)),
columns
,
...
...
@@ -94,6 +103,7 @@
},
rowSelection
:
{
type
:
'checkbox'
,
// @ts-ignore
selectedRowKeys
:
checkedKeys
,
onChange
:
onSelectChange
,
},
...
...
@@ -104,10 +114,9 @@
canResize
:
false
,
rowKey
:
(
record
:
any
)
=>
record
.
id
,
actionColumn
:
{
width
:
8
0
,
width
:
12
0
,
title
:
'操作'
,
dataIndex
:
'action'
,
fixed
:
'right'
,
},
});
...
...
@@ -150,14 +159,20 @@
};
const
handleDelete
=
(
record
:
Recordable
)
=>
{
setLoading
(
true
);
BatchOrderApi
.
remove
(
record
.
id
).
then
((
_
)
=>
{
reload
();
}).
catch
(()
=>
{
setLoading
(
false
);
});
};
const
handleBatchDelete
=
()
=>
{
setLoading
(
true
);
BatchOrderApi
.
batchRemove
(
checkedKeys
.
value
).
then
((
_
)
=>
{
reload
();
}).
catch
(()
=>
{
setLoading
(
false
);
});
};
...
...
@@ -166,6 +181,6 @@
};
const
handleView
=
(
record
)
=>
{
go
(
'/order/batch-order/'
+
record
.
id
);
go
(
'/
main/
order/batch-order/'
+
record
.
id
);
};
</
script
>
src/views/order/batch-order/schema.ts
浏览文件 @
d43b68e0
差异被折叠。
点击展开。
src/views/system/distributor/enum.ts
0 → 100644
浏览文件 @
d43b68e0
export
enum
StatusValEnum
{
PENDING_REVIEW
=
'PENDING_REVIEW'
,
PASSED
=
'PASSED'
,
REJECT
=
'REJECT'
,
FORBIDDEN
=
'FORBIDDEN'
,
}
src/views/system/distributor/schema.ts
浏览文件 @
d43b68e0
...
...
@@ -8,7 +8,7 @@
import
{
BasicColumn
}
from
'/@/components/Table'
;
import
{
FormSchema
}
from
'/@/components/Table'
;
import
{
StatusValEnum
}
from
'./enum'
;
export
enum
StatusEnum
{
PENDING_REVIEW
=
'待审核'
,
PASSED
=
'已通过'
,
...
...
@@ -18,7 +18,7 @@ export enum StatusEnum {
export
const
StatusEnumOptions
:
any
[]
=
[];
for
(
const
key
in
StatusEnum
)
{
StatusEnumOptions
.
push
({
value
:
key
,
value
:
StatusValEnum
[
key
]
,
label
:
StatusEnum
[
key
],
});
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论