diff --git a/src/api/erp/product/category/index.ts b/src/api/erp/product/category/index.ts
index d67ccffdd..7945eea32 100644
--- a/src/api/erp/product/category/index.ts
+++ b/src/api/erp/product/category/index.ts
@@ -13,8 +13,8 @@ export interface ProductCategoryVO {
// ERP 产品分类 API
export const ProductCategoryApi = {
// 查询产品分类列表
- getProductCategoryList: async () => {
- return await request.get({ url: `/erp/product-category/list` })
+ getProductCategoryList: async (params?: any) => {
+ return await request.get({ url: `/erp/product-category/list`, params })
},
// 查询产品分类精简列表
diff --git a/src/api/infra/demo/demo02/index.ts b/src/api/infra/demo/demo02/index.ts
index 736a12368..17d9c77dc 100644
--- a/src/api/infra/demo/demo02/index.ts
+++ b/src/api/infra/demo/demo02/index.ts
@@ -7,8 +7,8 @@ export interface Demo02CategoryVO {
}
// 查询示例分类列表
-export const getDemo02CategoryList = async () => {
- return await request.get({ url: `/infra/demo02-category/list` })
+export const getDemo02CategoryList = async (params?: any) => {
+ return await request.get({ url: `/infra/demo02-category/list`, params })
}
// 查询示例分类详情
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index e4091b96e..1de79a277 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -65,7 +65,12 @@
style="width: 100%"
@change="updateElementTask"
>
-
+
{{ audioProps.currentTime }}
-
+
{{ audioProps.duration }}
@@ -62,7 +62,8 @@ defineOptions({ name: 'Index' })
const currentSong = inject('currentSong', {})
-const audioRef = ref>(null)
+const audioRef = ref>(null)
+const audioProgress = ref(0)
// 音频相关属性https://www.runoob.com/tags/ref-av-dom.html
const audioProps = reactive({
autoplay: true,
diff --git a/src/views/crm/business/status/BusinessStatusForm.vue b/src/views/crm/business/status/BusinessStatusForm.vue
index d6a4d6f81..6eaf3cf46 100644
--- a/src/views/crm/business/status/BusinessStatusForm.vue
+++ b/src/views/crm/business/status/BusinessStatusForm.vue
@@ -59,19 +59,14 @@
-
+ addStatus()">
添加
deleteStatusArea(scope.$index)"
:disabled="formData.statuses.length <= 1"
>
删除
diff --git a/src/views/crm/customer/pool/index.vue b/src/views/crm/customer/pool/index.vue
index eab90e0c4..4b2076bfe 100644
--- a/src/views/crm/customer/pool/index.vue
+++ b/src/views/crm/customer/pool/index.vue
@@ -79,7 +79,7 @@
搜索
-
+
重置
diff --git a/src/views/erp/product/category/index.vue b/src/views/erp/product/category/index.vue
index 281835d78..53e1ca242 100644
--- a/src/views/erp/product/category/index.vue
+++ b/src/views/erp/product/category/index.vue
@@ -108,13 +108,6 @@
-
-
@@ -157,7 +150,6 @@ const getList = async () => {
/** 搜索按钮操作 */
const handleQuery = () => {
- queryParams.pageNo = 1
getList()
}
diff --git a/src/views/infra/codegen/ImportTable.vue b/src/views/infra/codegen/ImportTable.vue
index 29f18abde..411f95cf1 100644
--- a/src/views/infra/codegen/ImportTable.vue
+++ b/src/views/infra/codegen/ImportTable.vue
@@ -12,7 +12,7 @@
v-for="config in dataSourceConfigList"
:key="config.id"
:label="config.name"
- :value="config.id"
+ :value="config.id!"
/>
diff --git a/src/views/infra/demo/demo02/index.vue b/src/views/infra/demo/demo02/index.vue
index 9faa8c960..7e261fad3 100644
--- a/src/views/infra/demo/demo02/index.vue
+++ b/src/views/infra/demo/demo02/index.vue
@@ -98,13 +98,6 @@
-
-
@@ -124,7 +117,7 @@ const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
+const list = ref([]) // 列表的数据
const queryParams = reactive({
name: null,
parentId: null,
@@ -146,7 +139,6 @@ const getList = async () => {
/** 搜索按钮操作 */
const handleQuery = () => {
- queryParams.pageNo = 1
getList()
}
diff --git a/src/views/mall/promotion/coupon/formatter.ts b/src/views/mall/promotion/coupon/formatter.ts
index 8005d0c08..49c134a64 100644
--- a/src/views/mall/promotion/coupon/formatter.ts
+++ b/src/views/mall/promotion/coupon/formatter.ts
@@ -42,7 +42,7 @@ export const totalCountFormat = (row: CouponTemplateVO) => {
if (row.totalCount === -1) {
return '不限制'
}
- return row.totalCount
+ return `${row.totalCount}`
}
// 格式化【剩余数量】
@@ -50,7 +50,7 @@ export const remainedCountFormat = (row: CouponTemplateVO) => {
if (row.totalCount === -1) {
return '不限制'
}
- return row.totalCount - row.takeCount
+ return `${row.totalCount - row.takeCount}`
}
// 格式化【最低消费】
diff --git a/src/views/mall/promotion/seckill/config/SeckillConfigForm.vue b/src/views/mall/promotion/seckill/config/SeckillConfigForm.vue
index 185b25698..dcb21a20e 100644
--- a/src/views/mall/promotion/seckill/config/SeckillConfigForm.vue
+++ b/src/views/mall/promotion/seckill/config/SeckillConfigForm.vue
@@ -47,7 +47,7 @@